* Fix linking in msvc build.
* Remove /OPT:NOWIN98 linker flag.

svn path=/trunk/; revision=52353
This commit is contained in:
Amine Khaldi 2011-06-18 22:51:34 +00:00
parent bb2bf33fc8
commit e0aea1f31b
2 changed files with 6 additions and 1 deletions

View file

@ -109,7 +109,10 @@ list(APPEND SOURCE
add_library(glu32 SHARED ${SOURCE})
set_entrypoint(glu32 0)
target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
if(NOT MSVC)
target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames)
endif()
add_importlibs(glu32
opengl32

View file

@ -108,9 +108,11 @@
#pragma warning(disable : 4761)
#endif
/*
#if defined(_MSC_VER) && _MSC_VER >= 1200
#pragma comment(linker, "/OPT:NOWIN98")
#endif
*/
#ifndef GLAPIENTRY
#define GLAPIENTRY APIENTRY