fg_geometry: remove GLES-specific #ifdefs (in code and headers), update Android test...

[freeglut] / src / fg_init.c

diff --git a/src/fg_init.c b/src/fg_init.c
index d564e83..1e71931 100644 (file)
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -28,6 +28,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
+#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -90,6 +91,7 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
                       0,                      /* OpenGL context MinorVersion */
                       0,                      /* OpenGL ContextFlags */
                       0,                      /* OpenGL ContextProfile */
+                      0,                      /* HasOpenGL20 */
                       NULL,                   /* ErrorFunc */
                       NULL                    /* WarningFunc */
 };
@@ -102,7 +104,6 @@ extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
 
-
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
 {
 #ifndef _WIN32_WCE
@@ -380,6 +381,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
             fgState.Position.Use = GL_TRUE;
     }
+
+    fgInitGL2();
 }
 
 /*