X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=include%2FGL%2Ffreeglut_std.h;h=9250c3cca5459c3e93d8e5b6f7227469dd824834;hb=8aec061d3b95db47e642b8ac74607465bcb8dec3;hp=62c6fcd29c558678d01233359d965a6346c2b4e0;hpb=ee83427d3c6e31a51ec1a38197208ce2990fda22;p=freeglut

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 62c6fcd..9250c3c 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -35,40 +35,65 @@
 /*
  * Under windows, we have to differentiate between static and dynamic libraries
  */
-#if defined(WIN32)
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+
+/* #pragma may not be supported by some compilers.
+ * Discussion by FreeGLUT developers suggests that
+ * Visual C++ specific code involving pragmas may
+ * need to move to a separate header.  24th Dec 2003
+ */ 
+
+#   define WIN32_LEAN_AND_MEAN
+#   define NO_MIN_MAX
 #    include <windows.h>
-#    include <windowsx.h>
-#    include <mmsystem.h>
-#    define WINDOWS
-#ifdef FREEGLUT_STATIC
+#   undef min
+#   undef max
+
+/* Windows static library */
+#   ifdef FREEGLUT_STATIC
+
 #    define FGAPI
 #    define FGAPIENTRY
 
-#    pragma comment (lib, "freeglut_static.lib")    /* link with Win32 static freeglut lib */
+        /* Link with Win32 static freeglut lib */
+#       if defined(_MSC_VER)
+#           pragma comment (lib, "freeglut_static.lib")
+#       endif
 
-#else
+/* Windows shared library (DLL) */
+#   else
 
-#	if defined(FREEGLUT_EXPORTS)
-#		define FGAPI __declspec(dllexport)
-/* #		define FGAPI */
-#	else
-#		define FGAPI __declspec(dllimport)
-#   pragma comment (lib, "freeglut.lib")    /* link with Win32 freeglut lib */
-#	endif
-#	define FGAPIENTRY __stdcall
+#        if defined(FREEGLUT_EXPORTS)
+#                define FGAPI __declspec(dllexport)
+#        else
+#                define FGAPI __declspec(dllimport)
 
-#endif
+            /* link with Win32 shared freeglut lib */
+#           if defined(_MSC_VER)
+#               pragma comment (lib, "freeglut.lib")
+#        endif
+
+#       endif
+
+#       define FGAPIENTRY __stdcall
 
-#pragma comment (lib, "winmm.lib")       /* link with Windows MultiMedia lib */
-#pragma comment (lib, "user32.lib") /* link with Windows user lib */
-#pragma comment (lib, "gdi32.lib") /* link with Windows GDI lib */
-#pragma comment (lib, "opengl32.lib")    /* link with Microsoft OpenGL lib */
-#pragma comment (lib, "glu32.lib")       /* link with OpenGL Utility lib */
+#   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     */
+#   endif
 
 #else
-#	define FGAPI
-#	define FGAPIENTRY
+
+/* Non-Windows definition of FGAPI and FGAPIENTRY  */
+#        define FGAPI
+#        define FGAPIENTRY
+
 #endif
 
 /*
@@ -153,7 +178,7 @@
  *
  * Steve Baker suggested to make it binary compatible with GLUT:
  */
-#if defined(WIN32)
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
 #   define  GLUT_STROKE_ROMAN               ((void *)0x0000)
 #   define  GLUT_STROKE_MONO_ROMAN          ((void *)0x0001)
 #   define  GLUT_BITMAP_9_BY_15             ((void *)0x0002)