X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut.h;h=36fe111e84c06d184bf2a4790d2e6f6869dcb51a;hb=883d3be9367a61a832e26e029bc3b6475ee080ca;hp=8c2244932e63b91ca578f4651bf6f251f64e3e6b;hpb=bab36dfb0794924415499b87b983f8e7b1889440;p=freeglut

diff --git a/include/GL/freeglut.h b/include/GL/freeglut.h
index 8c22449..36fe111 100644
--- a/include/GL/freeglut.h
+++ b/include/GL/freeglut.h
@@ -36,7 +36,16 @@
  * Under windows, we've got some issues to solve
  */
 #if defined(WIN32)
-#if 0
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
+#    define WINDOWS
+#    pragma comment (lib, "winmm.lib")       /* link with Windows MultiMedia lib */
+#    pragma comment (lib, "opengl32.lib")    /* link with Microsoft OpenGL lib */
+#    pragma comment (lib, "glu32.lib")       /* link with OpenGL Utility lib */
+//#if defined(_USRDLL)
+//#	if defined(FREEGLUTLIB_EXPORTS)
+#if defined(FREEGLUT_DLL)
 #	if defined(FREEGLUT_LIBRARY_BUILD)
 #		define FGAPI __declspec(dllexport)
 #	else
@@ -44,19 +53,11 @@
 #	endif
 #	define FGAPIENTRY __stdcall
 #else
-#    include <windows.h>
-#    include <windowsx.h>
-#    include <mmsystem.h>
-#    define WINDOWS
 #    define FGAPI
 #    define FGAPIENTRY
+#    pragma comment (lib, "freeglut.lib")    /* link with Win32 freeglut lib */
 #endif
 
-#pragma comment (lib, "winmm.lib")       /* link with Windows MultiMedia lib */
-#pragma comment (lib, "opengl32.lib")    /* link with Microsoft OpenGL lib */
-#pragma comment (lib, "glu32.lib")       /* link with OpenGL Utility lib */
-#pragma comment (lib, "freeglut.lib")    /* link with Win32 freeglut lib */
-
 #else
 #	define FGAPI
 #	define FGAPIENTRY