Mesa (gallium-0.2): glut: Use a new define GLUT_STATIC to distinguish static builds.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sat Jan 24 14:35:25 UTC 2009
Module: Mesa
Branch: gallium-0.2
Commit: 0e4e76572e3a8808b06916b5359fc5cc71fd04a4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e4e76572e3a8808b06916b5359fc5cc71fd04a4
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat Jan 24 13:52:02 2009 +0000
glut: Use a new define GLUT_STATIC to distinguish static builds.
_DLL is defined by MSVC when building against a DLL version of the CRT
library. It bears no relation to whether we are building a DLL or not. That
is, we can build a DLL against a static CRT, or a static lib against a
dynamicaly linked CRT. See more detail at
http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
This gets DLL version of glut linking correctly both with MinGW and MSVC.
PS: GL/gl.h (and others) must be fixed too.
---
include/GL/glut.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/GL/glut.h b/include/GL/glut.h
index 6f877f3..f574f1d 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -109,9 +109,9 @@ extern _CRTIMP void __cdecl exit(int);
#endif
/* GLUT API entry point declarations for Win32. */
-#if (defined(BUILD_GLUT32) || defined(GLUT_BUILDING_LIB)) && defined(_DLL)
+#if (defined(BUILD_GLUT32) || defined(GLUT_BUILDING_LIB)) && !defined(GLUT_STATIC)
# define GLUTAPI __declspec(dllexport)
-#elif defined(_DLL)
+#elif !defined(GLUT_STATIC)
# define GLUTAPI __declspec(dllimport)
#else
# define GLUTAPI extern
More information about the mesa-commit
mailing list