From e0aea1f31b1859dc407e0873c6035f3cbf016092 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 18 Jun 2011 22:51:34 +0000 Subject: [PATCH] [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag. svn path=/trunk/; revision=52353 --- reactos/dll/win32/glu32/CMakeLists.txt | 5 ++++- reactos/dll/win32/glu32/include/gluos.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/glu32/CMakeLists.txt b/reactos/dll/win32/glu32/CMakeLists.txt index 68a4b03a093..24f98502940 100644 --- a/reactos/dll/win32/glu32/CMakeLists.txt +++ b/reactos/dll/win32/glu32/CMakeLists.txt @@ -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 diff --git a/reactos/dll/win32/glu32/include/gluos.h b/reactos/dll/win32/glu32/include/gluos.h index ad15a840316..bc88a534f2a 100644 --- a/reactos/dll/win32/glu32/include/gluos.h +++ b/reactos/dll/win32/glu32/include/gluos.h @@ -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