summaryrefslogtreecommitdiffhomepage
path: root/templates/simple_game
diff options
context:
space:
mode:
authorAhmad Fatoum <[email protected]>2018-03-16 21:31:10 +0100
committerAhmad Fatoum <[email protected]>2018-03-16 21:37:22 +0100
commit2c219fb81458b855c9383cd38885993192d856cd (patch)
tree66c87e91fc6395500acde4a995e9a9d3293ce272 /templates/simple_game
parent61e0e4b4f37cc66135445bc87af7c92399fa69ee (diff)
downloadraylib-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 'templates/simple_game')
-rw-r--r--templates/simple_game/simple_game.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/templates/simple_game/simple_game.c b/templates/simple_game/simple_game.c
index 50859221..028b1da8 100644
--- a/templates/simple_game/simple_game.c
+++ b/templates/simple_game/simple_game.c
@@ -14,10 +14,6 @@
#include "raylib.h"
-#if defined(PLATFORM_ANDROID)
- #include "android_native_app_glue.h"
-#endif
-
//----------------------------------------------------------------------------------
// Types and Structures Definition
//----------------------------------------------------------------------------------
@@ -26,22 +22,14 @@ typedef enum GameScreen { LOGO = 0, TITLE, GAMEPLAY, ENDING } GameScreen;
//----------------------------------------------------------------------------------
// 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)
//--------------------------------------------------------------------------------------
const int screenWidth = 800;
const int screenHeight = 450;
-#if defined(PLATFORM_ANDROID)
- InitWindow(screenWidth, screenHeight, app);
-#else
InitWindow(screenWidth, screenHeight, "raylib template - simple game");
-#endif
GameScreen currentScreen = LOGO;
@@ -158,7 +146,6 @@ int main(void)
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
-#if !defined(PLATFORM_ANDROID)
+
return 0;
-#endif
}