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/just_do/just_do.c | |
| parent | 18601f761935cd81b0f6298e22885c9bc6b5ee6e (diff) | |
| parent | 2ba43b595ec1129bd08b89104d5e0fa962d5b2b8 (diff) | |
| download | raylib-1.8.0.tar.gz raylib-1.8.0.zip | |
Merge pull request #371 from raysan5/develop1.8.0
Integrate Develop branch
Diffstat (limited to 'games/just_do/just_do.c')
| -rw-r--r-- | games/just_do/just_do.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/games/just_do/just_do.c b/games/just_do/just_do.c index 2ec178a4..a9fef18c 100644 --- a/games/just_do/just_do.c +++ b/games/just_do/just_do.c @@ -16,6 +16,10 @@ #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 @@ -49,14 +53,19 @@ 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 //--------------------------------------------------------- - const char windowTitle[30] = "JUST DO"; - - //SetupFlags(FLAG_FULLSCREEN_MODE); - InitWindow(screenWidth, screenHeight, windowTitle); +#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(); @@ -95,8 +104,9 @@ int main(void) CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- - +#if !defined(PLATFORM_ANDROID) return 0; +#endif } //---------------------------------------------------------------------------------- |