summaryrefslogtreecommitdiffhomepage
path: root/games/transmission
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 /games/transmission
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 'games/transmission')
-rw-r--r--games/transmission/transmission.c20
1 files changed, 5 insertions, 15 deletions
diff --git a/games/transmission/transmission.c b/games/transmission/transmission.c
index a508b5d2..37824a7b 100644
--- a/games/transmission/transmission.c
+++ b/games/transmission/transmission.c
@@ -17,10 +17,6 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined(PLATFORM_ANDROID)
- #include "android_native_app_glue.h"
-#endif
-
#if defined(PLATFORM_WEB)
#include <emscripten/emscripten.h>
#endif
@@ -55,20 +51,15 @@ static 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
//---------------------------------------------------------
-#if defined(PLATFORM_ANDROID)
- InitWindow(screenWidth, screenHeight, app);
-#else
+#ifndef PLATFORM_ANDROID
SetConfigFlags(FLAG_SHOW_LOGO); // | FLAG_FULLSCREEN_MODE);
- InitWindow(screenWidth, screenHeight, "raylib game - transmission mission");
#endif
+ // Note windowTitle is unused on Android
+ InitWindow(screenWidth, screenHeight, "raylib game - transmission mission");
// Global data loading (assets that must be available in all screens, i.e. fonts)
InitAudioDevice();
@@ -138,9 +129,8 @@ int main(void)
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
-#if !defined(PLATFORM_ANDROID)
+
return 0;
-#endif
}
//----------------------------------------------------------------------------------
@@ -462,4 +452,4 @@ void DrawButton(const char *text)
Vector2 measure = MeasureTextEx(fontMission, text, fontSizeButton, 0);
Vector2 textPos = {textPositionButton.x - measure.x/2 + 10, textPositionButton.y - measure.y/2 - 10};
DrawTextEx(fontMission, text, textPos , fontSizeButton, 0, textColorButton);
-} \ No newline at end of file
+}