Share the override default params with android

Benau · Benau · commit 8c00a1e8573b · 2019-07-13T14:22:22.000+08:00
diff --git a/android/Android.mk b/android/Android.mk
@@ -207,6 +207,7 @@ LOCAL_CFLAGS       := -I../lib/angelscript/include      \
                       -Iobj/openal/include              \
                       -Iobj/openssl/include             \
                       -DUSE_GLES2      \
+                      -DMOBILE_STK     \
                       -DENABLE_SOUND   \
                       -DENABLE_CRYPTO_OPENSSL           \
                       -DNDEBUG         \
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.h b/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.h
@@ -90,8 +90,10 @@ namespace irr
 
 }
 
+#define _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_
 #ifdef _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_
-extern void irrlicht_main();
+extern int ios_main(int argc, char *argv[]);
+extern void override_default_params_for_mobile();
 #endif
 
 #endif
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.mm b/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.mm
@@ -56,7 +56,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
     Active = true;
     Focus = false;
 
-    [self performSelectorOnMainThread:@selector(runIrrlicht) withObject:nil waitUntilDone:NO];
+    [self performSelectorOnMainThread:@selector(runSTK) withObject:nil waitUntilDone:NO];
 
     return YES;
 }
@@ -143,9 +143,10 @@ - (void)applicationDidBecomeActive:(UIApplication*)application
     Focus = true;
 }
 
-- (void)runIrrlicht
+- (void)runSTK
 {
-    irrlicht_main();
+    override_default_params_for_mobile();
+    ios_main(0, {});
 }
 
 - (void)setDevice:(irr::CIrrDeviceiOS*)device
diff --git a/src/main.cpp b/src/main.cpp
@@ -1858,7 +1858,11 @@ void main_abort()
 #endif
 
 // ----------------------------------------------------------------------------
-int main(int argc, char *argv[] )
+#ifdef IOS_STK
+int ios_main(int argc, char *argv[])
+#else
+int main(int argc, char *argv[])
+#endif
 {
     CommandLine::init(argc, argv);
 
diff --git a/src/main_android.cpp b/src/main_android.cpp
@@ -15,19 +15,21 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef ANDROID
+#ifdef MOBILE_STK
 
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "utils/log.hpp"
 
+#ifdef ANDROID
 #include "../../../lib/irrlicht/source/Irrlicht/CIrrDeviceAndroid.h"
+#endif
 
 extern int main(int argc, char *argv[]);
 
 struct android_app* global_android_app;
 
-void override_default_params()
+void override_default_params_for_mobile()
 {
     // It has an effect only on the first run, when config file is created.
     // So that we can still modify these params in STK options and user's
@@ -42,7 +44,8 @@ void override_default_params()
 
     // Enable multitouch race GUI
     UserConfigParams::m_multitouch_draw_gui = true;
-    
+
+#ifdef ANDROID
     // Set multitouch device scale depending on actual screen size
     int32_t screen_size = AConfiguration_getScreenSize(global_android_app->config);
     
@@ -67,7 +70,8 @@ void override_default_params()
     default:
         break;
     }
-    
+#endif
+
     // Enable screen keyboard
     UserConfigParams::m_screen_keyboard = 1;
     
@@ -82,6 +86,7 @@ void override_default_params()
     UserConfigParams::m_enforce_current_player = true;
 }
 
+#ifdef ANDROID
 void android_main(struct android_app* app) 
 {
     Log::info("AndroidMain", "Loading application...");
@@ -92,7 +97,7 @@ void android_main(struct android_app* app)
     CIrrDeviceAndroid::onCreate();
     
     app_dummy();
-    override_default_params();
+    override_default_params_for_mobile();
 
     main(0, {});
 
@@ -106,5 +111,6 @@ void android_main(struct android_app* app)
     fflush(NULL);
     _exit(0);
 }
+#endif
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,10 @@ namespace irr`
`90`	`90`
`91`	`91`	`}`
`92`	`92`
	`93`	`+#define _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_`
`93`	`94`	`#ifdef _IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_`
`94`		`-extern void irrlicht_main();`
	`95`	`+extern int ios_main(int argc, char *argv[]);`
	`96`	`+extern void override_default_params_for_mobile();`
`95`	`97`	`#endif`
`96`	`98`
`97`	`99`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N`
`56`	`56`	`Active = true;`
`57`	`57`	`Focus = false;`
`58`	`58`
`59`		`- [self performSelectorOnMainThread:@selector(runIrrlicht) withObject:nil waitUntilDone:NO];`
	`59`	`+ [self performSelectorOnMainThread:@selector(runSTK) withObject:nil waitUntilDone:NO];`
`60`	`60`
`61`	`61`	`return YES;`
`62`	`62`	`}`
`@@ -143,9 +143,10 @@ - (void)applicationDidBecomeActive:(UIApplication*)application`
`143`	`143`	`Focus = true;`
`144`	`144`	`}`
`145`	`145`
`146`		`-- (void)runIrrlicht`
	`146`	`+- (void)runSTK`
`147`	`147`	`{`
`148`		`- irrlicht_main();`
	`148`	`+ override_default_params_for_mobile();`
	`149`	`+ ios_main(0, {});`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`- (void)setDevice:(irr::CIrrDeviceiOS*)device`