diff options
| author | Ray <[email protected]> | 2017-10-22 20:43:57 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-22 20:43:57 +0200 |
| commit | 8380c488be90ed0c29a6446b490bfaca6574436e (patch) | |
| tree | 04e6dac350ecb354600b1019cc98fdbce03198c1 /games/wave_collector/wave_collector.c | |
| parent | 18601f761935cd81b0f6298e22885c9bc6b5ee6e (diff) | |
| parent | 2ba43b595ec1129bd08b89104d5e0fa962d5b2b8 (diff) | |
| download | raylib-8380c488be90ed0c29a6446b490bfaca6574436e.tar.gz raylib-8380c488be90ed0c29a6446b490bfaca6574436e.zip | |
Merge pull request #371 from raysan5/develop1.8.0
Integrate Develop branch
Diffstat (limited to 'games/wave_collector/wave_collector.c')
| -rw-r--r-- | games/wave_collector/wave_collector.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/games/wave_collector/wave_collector.c b/games/wave_collector/wave_collector.c index ebfc809c..d4ce33d9 100644 --- a/games/wave_collector/wave_collector.c +++ b/games/wave_collector/wave_collector.c @@ -22,6 +22,10 @@ #include <stdio.h> // Required for: printf() #include <string.h> // Required for: strcpy() +#if defined(PLATFORM_ANDROID) + #include "android_native_app_glue.h" +#endif + #if defined(PLATFORM_WEB) #include <emscripten/emscripten.h> #endif @@ -56,11 +60,15 @@ static void UpdateDrawFrame(void); // Update and Draw one frame //---------------------------------------------------------------------------------- // Main entry point //---------------------------------------------------------------------------------- -int main(int argc, char *argv[]) +#if defined(PLATFORM_ANDROID) +void android_main(struct android_app *app) +#else +int main(void) +#endif { // Initialization //--------------------------------------------------------- -#if !defined(PLATFORM_WEB) +#if defined(PLATFORM_DESKTOP) // TODO: Support for dropped files on the exe // Support command line argument for custom music file @@ -81,8 +89,12 @@ int main(int argc, char *argv[]) } #endif +#if defined(PLATFORM_ANDROID) + InitWindow(screenWidth, screenHeight, app); +#else SetConfigFlags(FLAG_MSAA_4X_HINT); InitWindow(screenWidth, screenHeight, "GGJ17 - WAVE COLLECTOR"); +#endif // Global data loading (assets that must be available in all screens, i.e. fonts) InitAudioDevice(); @@ -131,8 +143,9 @@ int main(int argc, char *argv[]) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - +#if !defined(PLATFORM_ANDROID) return 0; +#endif } //---------------------------------------------------------------------------------- |