diff options
| author | Ahmad Fatoum <[email protected]> | 2018-03-16 21:31:10 +0100 |
|---|---|---|
| committer | Ahmad Fatoum <[email protected]> | 2018-03-16 21:37:22 +0100 |
| commit | 2c219fb81458b855c9383cd38885993192d856cd (patch) | |
| tree | 66c87e91fc6395500acde4a995e9a9d3293ce272 /games/just_do | |
| parent | 61e0e4b4f37cc66135445bc87af7c92399fa69ee (diff) | |
| download | raylib-2c219fb81458b855c9383cd38885993192d856cd.tar.gz raylib-2c219fb81458b855c9383cd38885993192d856cd.zip | |
Allow use of main instead of android_main
Inspired by #504.
Instead of requiring the user to do PLATFORM_ANDROID #ifdefery,
have the android_main entry point exported by raylib and call
the user-defined main. This way many games could (in theory)
run unmodified on Android and elsewhere.
This is untested!
Diffstat (limited to 'games/just_do')
| -rw-r--r-- | games/just_do/just_do.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/games/just_do/just_do.c b/games/just_do/just_do.c index a9fef18c..c7c76af9 100644 --- a/games/just_do/just_do.c +++ b/games/just_do/just_do.c @@ -16,10 +16,6 @@ #include "raylib.h" #include "screens/screens.h" // NOTE: Defines currentScreen -#if defined(PLATFORM_ANDROID) - #include "android_native_app_glue.h" -#endif - #if defined(PLATFORM_WEB) #include <emscripten/emscripten.h> #endif @@ -53,19 +49,11 @@ void UpdateDrawFrame(void); // Update and Draw one frame //---------------------------------------------------------------------------------- // Main entry point //---------------------------------------------------------------------------------- -#if defined(PLATFORM_ANDROID) -void android_main(struct android_app *app) -#else int main(void) -#endif { - // Initialization + // Initialization (Note windowTitle is unused on Android) //--------------------------------------------------------- -#if defined(PLATFORM_ANDROID) - InitWindow(screenWidth, screenHeight, app); -#else InitWindow(screenWidth, screenHeight, "GGJ15 - JUST DO"); -#endif // Load global data here (assets that must be available in all screens, i.e. fonts) InitAudioDevice(); @@ -104,9 +92,8 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- -#if !defined(PLATFORM_ANDROID) + return 0; -#endif } //---------------------------------------------------------------------------------- @@ -370,4 +357,4 @@ void UpdateDrawFrame(void) EndDrawing(); //---------------------------------------------------------------------------------- -}
\ No newline at end of file +} |