X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=8fd65d8b03fc321bfe91d248e8d5bba23c6c0bbb;hb=7b02ff54703f2be772af08669c38e338deea1e33;hp=9250c3cca5459c3e93d8e5b6f7227469dd824834;hpb=529bce67e31e6d99b07398160e04efc97216b47c;p=freeglut

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 9250c3c..8fd65d8 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -35,7 +35,7 @@
 /*
  * Under windows, we have to differentiate between static and dynamic libraries
  */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__)
 
 /* #pragma may not be supported by some compilers.
  * Discussion by FreeGLUT developers suggests that
@@ -56,7 +56,7 @@
 #    define FGAPIENTRY
 
         /* Link with Win32 static freeglut lib */
-#       if defined(_MSC_VER)
+#       if defined(_MSC_VER) || defined(__WATCOMC__)
 #           pragma comment (lib, "freeglut_static.lib")
 #       endif
 
@@ -69,8 +69,10 @@
 #                define FGAPI __declspec(dllimport)
 
             /* link with Win32 shared freeglut lib */
-#           if defined(_MSC_VER)
-#               pragma comment (lib, "freeglut.lib")
+#           if defined(_MSC_VER) || defined(__WATCOMC__)
+#               ifndef _WIN32_WCE
+#                   pragma comment (lib, "freeglut.lib")
+#               endif
 #        endif
 
 #       endif
@@ -80,12 +82,14 @@
 #   endif
 
 /* 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     */
+#   if defined(_MSC_VER) || defined(__WATCOMC__)
+#       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
@@ -178,7 +183,7 @@
  *
  * Steve Baker suggested to make it binary compatible with GLUT:
  */
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__)
 #   define  GLUT_STROKE_ROMAN               ((void *)0x0000)
 #   define  GLUT_STROKE_MONO_ROMAN          ((void *)0x0001)
 #   define  GLUT_BITMAP_9_BY_15             ((void *)0x0002)
@@ -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 );
 
 /*