[ros-diffs] [tfaber] 54092: [STLPORT] - Revert r54088 [GLU32] - Do not use stlport headers with MSVC, as they are broken. Should really fix MSVC build

[tfaber at svn.reactos.org]

Author: tfaber
Date: Wed Oct 12 11:49:25 2011
New Revision: 54092

URL: http://svn.reactos.org/svn/reactos?rev=54092&view=rev
Log:
[STLPORT]
- Revert r54088
[GLU32]
- Do not use stlport headers with MSVC, as they are broken. Should really fix MSVC build

Modified:
    trunk/reactos/dll/win32/glu32/CMakeLists.txt
    trunk/reactos/include/c++/stlport/stl/config/_windows.h

Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists.txt?rev=54092&r1=54091&r2=54092&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Wed Oct 12 11:49:25 2011
@@ -1,5 +1,7 @@
 
-set_cpp()
+if(NOT MSVC)
+    set_cpp()
+endif()
 
 add_definitions(
     -DRESOLVE_3D_TEXTURE_SUPPORT

Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/stl/config/_windows.h?rev=54092&r1=54091&r2=54092&view=diff
==============================================================================
--- trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Oct 12 11:49:25 2011
@@ -98,10 +98,6 @@
 /* Define WIN32_NO_STATUS to prevent status codes redefinitions */
 #      if !defined(WIN32_NO_STATUS)
 #        define WIN32_NO_STATUS
-#      endif
-/* Don't let windows.h define its min and max macros. */
-#      if !defined (NOMINMAX)
-#        define NOMINMAX
 #      endif
 #      include <windef.h>