X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_ext.c;h=b920e30e441b082cf8cfb101301aa6f04aacf351;hb=30971e75717f3d7b826714fbbb1171dfaf9164cf;hp=875945e5284dca9ed0e309054ea26cca784a6fc7;hpb=f0fa306fbd7cb7a61d5b9229c808ff66c858331f;p=freeglut diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c index 875945e..b920e30 100644 --- a/src/freeglut_ext.c +++ b/src/freeglut_ext.c @@ -104,9 +104,9 @@ static GLUTproc fghGetProcAddress( const char* procName ) CHECK_NAME(glutWindowStatusFunc); CHECK_NAME(glutKeyboardUpFunc); CHECK_NAME(glutSpecialUpFunc); -#if !TARGET_HOST_WINCE +#if !defined(_WIN32_WCE) CHECK_NAME(glutJoystickFunc); -#endif /* !TARGET_HOST_WINCE */ +#endif /* !defined(_WIN32_WCE) */ CHECK_NAME(glutSetColor); CHECK_NAME(glutGetColor); CHECK_NAME(glutCopyColormap); @@ -147,13 +147,13 @@ static GLUTproc fghGetProcAddress( const char* procName ) CHECK_NAME(glutReportErrors); CHECK_NAME(glutIgnoreKeyRepeat); CHECK_NAME(glutSetKeyRepeat); -#if !TARGET_HOST_WINCE +#if !defined(_WIN32_WCE) CHECK_NAME(glutForceJoystickFunc); CHECK_NAME(glutGameModeString); CHECK_NAME(glutEnterGameMode); CHECK_NAME(glutLeaveGameMode); CHECK_NAME(glutGameModeGet); -#endif /* !TARGET_HOST_WINCE */ +#endif /* !defined(_WIN32_WCE) */ /* freeglut extensions */ CHECK_NAME(glutMainLoopEvent); CHECK_NAME(glutLeaveMainLoop); @@ -161,6 +161,7 @@ static GLUTproc fghGetProcAddress( const char* procName ) CHECK_NAME(glutWMCloseFunc); CHECK_NAME(glutMenuDestroyFunc); CHECK_NAME(glutSetOption); + CHECK_NAME(glutGetModeValues); CHECK_NAME(glutSetWindowData); CHECK_NAME(glutGetWindowData); CHECK_NAME(glutSetMenuData); @@ -208,9 +209,9 @@ glutGetProcAddress( const char *procName ) return p; /* Try core GL functions */ -#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS return(GLUTproc)wglGetProcAddress( ( LPCSTR )procName ); -#elif TARGET_HOST_UNIX_X11 && defined( GLX_ARB_get_proc_address ) +#elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address ) return(GLUTproc)glXGetProcAddressARB( ( const GLubyte * )procName ); #else return NULL;