X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_runtime_android.c;h=c92d5f148ea2161fd091e4ef710e9ea805398bad;hb=4a451851ec51ea7c3b79534fa5faebadceedf4df;hp=acac390dccfd248ae23d9c72b17293da5d466cd3;hpb=329ff5a3e911e6a0e6cf4d75f25f9ccedd3b7693;p=freeglut

diff --git a/src/android/fg_runtime_android.c b/src/android/fg_runtime_android.c
index acac390..c92d5f1 100644
--- a/src/android/fg_runtime_android.c
+++ b/src/android/fg_runtime_android.c
@@ -49,6 +49,7 @@
 #include <android/asset_manager.h>
 #include <android/native_window.h>
 #include "android/native_app_glue/android_native_app_glue.h"
+#include "android/fg_main_android.h"
 
 #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "FreeGLUT", __VA_ARGS__))
 #define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "FreeGLUT", __VA_ARGS__))
@@ -137,7 +138,7 @@ static void extract_assets(struct android_app* app) {
  * event loop for receiving input events and doing other things.
  */
 void android_main(struct android_app* app) {
-  LOGI("android_main");
+  LOGI("android_main savedState=%p", app->savedState);
 
   /* Register window resize callback */
   app->activity->callbacks->onNativeWindowResized = onNativeWindowResized;
@@ -153,6 +154,7 @@ void android_main(struct android_app* app) {
   {
     char progname[5] = "self";
     char* argv[] = {progname, NULL};
+    fgDisplay.pDisplay.app = app;
     main(1, argv);
     /* FreeGLUT will exit() by itself if
        GLUT_ACTION_ON_WINDOW_CLOSE == GLUT_ACTION_EXIT */
@@ -160,11 +162,6 @@ void android_main(struct android_app* app) {
 
   LOGI("android_main: end");
 
-  /* Finish processing all events (namely APP_CMD_DESTROY) before
-     exiting thread */
-  while (!app->destroyRequested)
-      fgPlatformProcessSingleEvent();
-
   /* Let NativeActivity restart us */
   /* Users may want to forcibly exit() in their main() anyway because
      NativeActivity doesn't dlclose() us, so all statically-assigned