X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=f5723e0fb4e2b284998b652156bbcdf0f63607e5;hb=5a199722938773360dd7bcc80a917bf4a1856111;hp=9250c3cca5459c3e93d8e5b6f7227469dd824834;hpb=529bce67e31e6d99b07398160e04efc97216b47c;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 9250c3c..f5723e0 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -70,7 +70,9 @@ /* link with Win32 shared freeglut lib */ # if defined(_MSC_VER) -# pragma comment (lib, "freeglut.lib") +# ifndef _WIN32_WCE +# pragma comment (lib, "freeglut.lib") +# endif # endif # endif @@ -81,11 +83,13 @@ /* Drag in other Windows libraries as required by FreeGLUT */ # if defined(_MSC_VER) -# pragma comment (lib, "winmm.lib") /* link Windows MultiMedia lib */ -# pragma comment (lib, "user32.lib") /* link Windows user lib */ -# pragma comment (lib, "gdi32.lib") /* link Windows GDI lib */ -# pragma comment (lib, "opengl32.lib") /* link Microsoft OpenGL lib */ -# pragma comment (lib, "glu32.lib") /* link OpenGL Utility lib */ +# ifndef _WIN32_WCE +# pragma comment (lib, "winmm.lib") /* link Windows MultiMedia lib */ +# pragma comment (lib, "user32.lib") /* link Windows user lib */ +# pragma comment (lib, "gdi32.lib") /* link Windows GDI lib */ +# pragma comment (lib, "opengl32.lib") /* link Microsoft OpenGL lib */ +# pragma comment (lib, "glu32.lib") /* link OpenGL Utility lib */ +# endif /* _WIN32_WCE */ # endif #else @@ -102,6 +106,7 @@ #define FREEGLUT 1 #define GLUT_API_VERSION 4 #define FREEGLUT_VERSION_2_0 1 +#define GLUT_XLIB_IMPLEMENTATION 13 /* * Always include OpenGL and GLU headers @@ -553,7 +558,7 @@ FGAPI void FGAPIENTRY glutCopyColormap( int window ); * Misc keyboard and joystick functions, see freeglut_misc.c */ FGAPI void FGAPIENTRY glutIgnoreKeyRepeat( int ignore ); -FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); /* DEPRECATED 11/4/02 - Do not use */ +FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); FGAPI void FGAPIENTRY glutForceJoystickFunc( void ); /*