[Csp-commits] svn:csp r1261 - trunk/CSP/Demeter

[<sv...@ww...>]

Author: delta
Date: 2004-09-29 08:23:20 -0700 (Wed, 29 Sep 2004)
New Revision: 1261

Modified:
   trunk/CSP/Demeter/CHANGES.current
   trunk/CSP/Demeter/DemeterVisualC6.vcproj
   trunk/CSP/Demeter/Terrain.h
Log:
Added #NOMINMAX before including windows.h to avoid conflict with std::max/min.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1261

Modified: trunk/CSP/Demeter/CHANGES.current
===================================================================
--- trunk/CSP/Demeter/CHANGES.current	2004-09-28 21:22:24 UTC (rev 1260)
+++ trunk/CSP/Demeter/CHANGES.current	2004-09-29 15:23:20 UTC (rev 1261)
@@ -1,6 +1,9 @@
 Version 0.3.2 (in progress)
 ===========================
-
+2004-09-29: delta
+		Added #NOMINMAX before including windows.h to avoid
+		conflict with std::max/min.
+		
 2004-04-25: delta
         Adjusted paths.
         

Modified: trunk/CSP/Demeter/DemeterVisualC6.vcproj
===================================================================
--- trunk/CSP/Demeter/DemeterVisualC6.vcproj	2004-09-28 21:22:24 UTC (rev 1260)
+++ trunk/CSP/Demeter/DemeterVisualC6.vcproj	2004-09-29 15:23:20 UTC (rev 1261)
@@ -25,13 +25,13 @@
 				AdditionalIncludeDirectories="..\Include,..\Include\SDL"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
 				PrecompiledHeaderFile=".\Debug/DemeterVisualC6.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
+				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
 				CompileAs="0"/>
@@ -91,7 +91,7 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;DEMETERVISUALC6_EXPORTS;TERRAIN_EXPORTS"
 				StringPooling="TRUE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
 				RuntimeTypeInfo="TRUE"
 				PrecompiledHeaderFile=".\Release/DemeterVisualC6.pch"
@@ -100,7 +100,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				CompileAs="2"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool

Modified: trunk/CSP/Demeter/Terrain.h
===================================================================
--- trunk/CSP/Demeter/Terrain.h	2004-09-28 21:22:24 UTC (rev 1260)
+++ trunk/CSP/Demeter/Terrain.h	2004-09-29 15:23:20 UTC (rev 1261)
@@ -60,6 +60,7 @@
 
 #include <string.h>
 #ifdef _WIN32
+#define NOMINMAX
     #include <windows.h>
 #endif
 #include <GL/gl.h>