X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_internal_android.h;h=5504b44d14788560d1aa85703287b28daa9694e6;hb=67f242b7dd68bea7dea467f9b5265c8448b6655e;hp=c072136ceb35f311d9153a9fb2d4c0cd2138f9c0;hpb=cb1e59cf5e6ac8034ae91abfd320874004a44c88;p=freeglut

diff --git a/src/android/fg_internal_android.h b/src/android/fg_internal_android.h
index c072136..5504b44 100644
--- a/src/android/fg_internal_android.h
+++ b/src/android/fg_internal_android.h
@@ -32,12 +32,14 @@
 #include "egl/fg_internal_egl.h"
 
 /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
-/* The structure used by display initialization in freeglut_init.c */
+/* The structure used by display initialization in fg_init.c */
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
+struct android_app;
 struct tagSFG_PlatformDisplay
 {
   struct tagSFG_PlatformDisplayEGL egl;
-  struct tagSFG_Window* single_window;
+  EGLNativeWindowType single_native_window;
+  struct android_app* app;
 };
 
 typedef struct tagSFG_PlatformContext SFG_PlatformContext;
@@ -66,7 +68,7 @@ struct touchscreen {
 
 /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
 /*
- * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
+ * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c"
  * interspersed
  */
 
@@ -104,7 +106,15 @@ struct tagSFG_PlatformJoystick
 typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
 struct tagSFG_PlatformWindowState
 {
-    int unused;
+    char unused;
 };
 
+/* Menu font and color definitions */
+#define  FREEGLUT_MENU_FONT    NULL
+
+#define  FREEGLUT_MENU_PEN_FORE_COLORS   {0.0f,  0.0f,  0.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_BACK_COLORS   {0.70f, 0.70f, 0.70f, 1.0f}
+#define  FREEGLUT_MENU_PEN_HFORE_COLORS  {0.0f,  0.0f,  0.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_HBACK_COLORS  {1.0f,  1.0f,  1.0f,  1.0f}
+
 #endif  /* FREEGLUT_INTERNAL_ANDROID_H */