X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_window_android.c;h=a6ce2012aa601aecdf989c7b273f103b2cc5c855;hb=329ff5a3e911e6a0e6cf4d75f25f9ccedd3b7693;hp=58d612afe4c4771dfbbbcc37d13e8a85afa9a9cf;hpb=e5cd5f98d651aad9c265e569db6188fb0378aeeb;p=freeglut diff --git a/src/android/fg_window_android.c b/src/android/fg_window_android.c index 58d612a..a6ce201 100644 --- a/src/android/fg_window_android.c +++ b/src/android/fg_window_android.c @@ -1,5 +1,5 @@ /* - * freeglut_window_android.c + * fg_window_android.c * * Window management methods for Android * @@ -30,6 +30,7 @@ #include #include "fg_internal.h" #include "egl/fg_window_egl.h" +#include "android/fg_main_android.h" /* * Opens a window. Requires a SFG_Window object created and attached @@ -40,15 +41,11 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title, GLboolean sizeUse, int w, int h, GLboolean gameMode, GLboolean isSubWindow ) { - // printf("fgPlatformOpenWindow %p ID=%d\n", (void*)window, window->ID); - /* TODO: only one full-screen window possible? */ - static int nb_windows = 0; - if (nb_windows == 0) { - nb_windows++; + if (fgDisplay.pDisplay.single_window == NULL) { fgDisplay.pDisplay.single_window = window; - // printf("=> %p ID=%d\n", (void*)fgDisplay.pDisplay.single_window, fgDisplay.pDisplay.single_window->ID); } else { + fgWarning("You can't have more than one window on Android"); return; }