[ros-diffs] [akhaldi] 52353: [GLU32] * Fix linking in msvc build. * Remove /OPT:NOWIN98 linker flag.

Author: akhaldi
Date: Sat Jun 18 22:51:34 2011
New Revision: 52353

URL: http://svn.reactos.org/svn/reactos?rev=52353&view=rev
Log:
[GLU32]
* Fix linking in msvc build.
* Remove /OPT:NOWIN98 linker flag.

Modified:
    trunk/reactos/dll/win32/glu32/CMakeLists.txt
    trunk/reactos/dll/win32/glu32/include/gluos.h

Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sat Jun 18 22:51:34 2011
@@ -109,7 +109,10 @@
 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

Modified: trunk/reactos/dll/win32/glu32/include/gluos.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/include/gl…
==============================================================================
--- trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Sat Jun 18 22:51:34 2011
@@ -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