Revert X11 fgCloseWindow to 1.38 pre-offscreen implementation.

[freeglut] / src / freeglut_ext.c

diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c
index 5b2ca92..cf2f4f9 100644 (file)
--- a/src/freeglut_ext.c
+++ b/src/freeglut_ext.c
@@ -29,7 +29,9 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#define GLX_GLXEXT_PROTOTYPES
+
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 
@@ -109,7 +111,9 @@ static struct name_address_pair glut_functions[] =
    { "glutWindowStatusFunc", (void *) glutWindowStatusFunc },
    { "glutKeyboardUpFunc", (void *) glutKeyboardUpFunc },
    { "glutSpecialUpFunc", (void *) glutSpecialUpFunc },
+#if !TARGET_HOST_WINCE
    { "glutJoystickFunc", (void *) glutJoystickFunc },
+#endif //TARGET_HOST_WINCE
    { "glutSetColor", (void *) glutSetColor },
    { "glutGetColor", (void *) glutGetColor },
    { "glutCopyColormap", (void *) glutCopyColormap },
@@ -150,11 +154,13 @@ static struct name_address_pair glut_functions[] =
    { "glutReportErrors", (void *) glutReportErrors },
    { "glutIgnoreKeyRepeat", (void *) glutIgnoreKeyRepeat },
    { "glutSetKeyRepeat", (void *) glutSetKeyRepeat },
+#if !TARGET_HOST_WINCE
    { "glutForceJoystickFunc", (void *) glutForceJoystickFunc },
    { "glutGameModeString", (void *) glutGameModeString },
    { "glutEnterGameMode", (void *) glutEnterGameMode },
    { "glutLeaveGameMode", (void *) glutLeaveGameMode },
    { "glutGameModeGet", (void *) glutGameModeGet },
+#endif //TARGET_HOST_WINCE
    /* freeglut extensions */
    { "glutMainLoopEvent", (void *) glutMainLoopEvent },
    { "glutLeaveMainLoop", (void *) glutLeaveMainLoop },
@@ -177,7 +183,7 @@ static struct name_address_pair glut_functions[] =
    { "glutGetProcAddress", (void *) glutGetProcAddress },
    { "glutMouseWheelFunc", (void *) glutMouseWheelFunc },
    { NULL, NULL }
-};   
+};
 
 
 void *FGAPIENTRY glutGetProcAddress( const char *procName )
@@ -185,11 +191,11 @@ void *FGAPIENTRY glutGetProcAddress( const char *procName )
     /* Try GLUT functions first */
     int i;
     for( i = 0; glut_functions[ i ].name; i++ )
-       if( strcmp( glut_functions[ i ].name, procName ) == 0)
-           return glut_functions[ i ].address;
+        if( strcmp( glut_functions[ i ].name, procName ) == 0)
+            return glut_functions[ i ].address;
 
     /* Try core GL functions */
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
     return( void * )wglGetProcAddress( ( LPCSTR )procName );
 #elif TARGET_HOST_UNIX_X11 && defined( GLX_ARB_get_proc_address )
     return(void * )glXGetProcAddressARB( ( const GLubyte * )procName );