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:
dcnieho 2012-05-25 01:31:25 +00:00
parent 0065de7ac6
commit ce8d4a2137
3 changed files with 14 additions and 3 deletions

View File

@ -197,6 +197,10 @@ ENDIF()
IF(WIN32)
# hide insecure CRT warnings, common practice
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
IF(MSVC)
SET( CMAKE_DEBUG_POSTFIX "d" )
ENDIF(MSVC)
ENDIF()
IF(CMAKE_COMPILER_IS_GNUCC)

View File

@ -70,7 +70,11 @@
/* Link with Win32 static freeglut lib */
# if FREEGLUT_LIB_PRAGMAS
# ifdef NDEBUG
# pragma comment (lib, "freeglut_static.lib")
# else
# pragma comment (lib, "freeglut_staticd.lib")
# endif
# endif
/* Windows shared library (DLL) */
@ -84,7 +88,11 @@
/* Link with Win32 shared freeglut lib */
# if FREEGLUT_LIB_PRAGMAS
# ifdef NDEBUG
# pragma comment (lib, "freeglut.lib")
# else
# pragma comment (lib, "freeglutd.lib")
# endif
# endif
# endif

View File

@ -1,4 +1,3 @@
LIBRARY freeglut
VERSION @VERSION_MAJOR@.@VERSION_MINOR@
EXPORTS
glutInit