on windows+MSVC, debug builds of the library now have a 'd' suffix.
freeglutdll.def was edited to no longer include the name of teh library that would clash with this and freeglut_std.h was edited to specify linking to the right library when building in debug mode git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1322 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
0065de7ac6
commit
ce8d4a2137
@ -197,6 +197,10 @@ ENDIF()
|
|||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
# hide insecure CRT warnings, common practice
|
# hide insecure CRT warnings, common practice
|
||||||
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
|
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
|
IF(MSVC)
|
||||||
|
SET( CMAKE_DEBUG_POSTFIX "d" )
|
||||||
|
ENDIF(MSVC)
|
||||||
|
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
@ -70,7 +70,11 @@
|
|||||||
|
|
||||||
/* Link with Win32 static freeglut lib */
|
/* Link with Win32 static freeglut lib */
|
||||||
# if FREEGLUT_LIB_PRAGMAS
|
# if FREEGLUT_LIB_PRAGMAS
|
||||||
|
# ifdef NDEBUG
|
||||||
# pragma comment (lib, "freeglut_static.lib")
|
# pragma comment (lib, "freeglut_static.lib")
|
||||||
|
# else
|
||||||
|
# pragma comment (lib, "freeglut_staticd.lib")
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
/* Windows shared library (DLL) */
|
/* Windows shared library (DLL) */
|
||||||
@ -84,7 +88,11 @@
|
|||||||
|
|
||||||
/* Link with Win32 shared freeglut lib */
|
/* Link with Win32 shared freeglut lib */
|
||||||
# if FREEGLUT_LIB_PRAGMAS
|
# if FREEGLUT_LIB_PRAGMAS
|
||||||
|
# ifdef NDEBUG
|
||||||
# pragma comment (lib, "freeglut.lib")
|
# pragma comment (lib, "freeglut.lib")
|
||||||
|
# else
|
||||||
|
# pragma comment (lib, "freeglutd.lib")
|
||||||
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# endif
|
# endif
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
LIBRARY freeglut
|
|
||||||
VERSION @VERSION_MAJOR@.@VERSION_MINOR@
|
VERSION @VERSION_MAJOR@.@VERSION_MINOR@
|
||||||
EXPORTS
|
EXPORTS
|
||||||
glutInit
|
glutInit
|
||||||
|
Reference in New Issue
Block a user