Make Android work again - adapt to recent changes and fix use of GL-nonES function

[freeglut] / src / gles_stubs.c

diff --git a/src/gles_stubs.c b/src/gles_stubs.c
index 2a67174..669f44a 100644 (file)
--- a/src/gles_stubs.c
+++ b/src/gles_stubs.c
@@ -18,7 +18,7 @@ GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
   return GL_FALSE;
 }
 
-int  glutCreateMenu( void (* callback)( int menu ) ) {}
+int  glutCreateMenu( void (* callback)( int menu ) ) { return 0; }
 void glutDestroyMenu( int menu ) {}
 int  glutGetMenu( void ) { return 0; }
 void glutSetMenu( int menu ) {}
@@ -29,6 +29,7 @@ void glutChangeToSubMenu( int item, const char* label, int value ) {}
 void glutRemoveMenuItem( int item ) {}
 void glutAttachMenu( int button ) {}
 void glutDetachMenu( int button ) {}
+void glutSetMenuFont( int menuID, void* font ) {}
 
 void glutBitmapCharacter( void* font, int character ) {}
 int  glutBitmapWidth( void* font, int character ) { return 0; }
@@ -37,7 +38,7 @@ int  glutStrokeWidth( void* font, int character ) { return 0; }
 int  glutBitmapLength( void* font, const unsigned char* string ) { return 0; }
 int  glutStrokeLength( void* font, const unsigned char* string ) { return 0; }
 
-void *glutGetMenuData( void ) {}
+void *glutGetMenuData( void ) { return NULL; }
 void  glutSetMenuData(void* data) {}
 
 int     glutBitmapHeight( void* font ) { return 0; }