X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_ext.c;h=ff13adc798ea509add8b1498056f89a4503b8090;hb=c24efb9241080a043193b67c6a9718312fed8d07;hp=2c98d4b4a983307f5e98ce49d5d44e9f15870f8e;hpb=7d0fc844c337b9c8901317d6935c3462b59ceda5;p=freeglut

diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c
index 2c98d4b..ff13adc 100644
--- a/src/freeglut_ext.c
+++ b/src/freeglut_ext.c
@@ -25,16 +25,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define GLX_GLXEXT_PROTOTYPES
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-
 struct name_address_pair
 {
     const char *name;
@@ -111,7 +105,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 },
@@ -152,11 +148,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 },
@@ -179,19 +177,20 @@ static struct name_address_pair glut_functions[] =
    { "glutGetProcAddress", (void *) glutGetProcAddress },
    { "glutMouseWheelFunc", (void *) glutMouseWheelFunc },
    { NULL, NULL }
-};   
+};
 
 
 void *FGAPIENTRY glutGetProcAddress( const char *procName )
 {
     /* Try GLUT functions first */
     int i;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetProcAddress" );
     for( i = 0; glut_functions[ i ].name; i++ )
         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 );