From 97802435868286c5e1803e10bbbb32e7e2ee2390 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 9 Sep 2010 06:47:45 +0000
Subject: [PATCH] Add NOMINMAX to the libaegisub project

Originally committed to SVN as r4775.
---
 aegisub/build/libaegisub_vs2008/compiler_options.vsprops      | 4 ++--
 .../build/libaegisub_vs2008/compiler_options_debug.vsprops    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aegisub/build/libaegisub_vs2008/compiler_options.vsprops b/aegisub/build/libaegisub_vs2008/compiler_options.vsprops
index da57a9c7a..a9d6cacf1 100644
--- a/aegisub/build/libaegisub_vs2008/compiler_options.vsprops
+++ b/aegisub/build/libaegisub_vs2008/compiler_options.vsprops
@@ -7,12 +7,12 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		EnableIntrinsicFunctions="true"
+		PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;NOMINMAX"
 		RuntimeLibrary="2"
 		OpenMP="true"
 		WarningLevel="3"
 		WarnAsError="true"
-        DebugInformationFormat="3"
-        PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+		DebugInformationFormat="3"
 	/>
 	<Tool
 		Name="VCLinkerTool"
diff --git a/aegisub/build/libaegisub_vs2008/compiler_options_debug.vsprops b/aegisub/build/libaegisub_vs2008/compiler_options_debug.vsprops
index fe1663f67..6ecc345df 100644
--- a/aegisub/build/libaegisub_vs2008/compiler_options_debug.vsprops
+++ b/aegisub/build/libaegisub_vs2008/compiler_options_debug.vsprops
@@ -10,13 +10,13 @@
 		InlineFunctionExpansion="0"
 		EnableIntrinsicFunctions="false"
 		WholeProgramOptimization="false"
-		PreprocessorDefinitions="DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS"
+		PreprocessorDefinitions="DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;NOMINMAX"
 		BasicRuntimeChecks="3"
 		RuntimeLibrary="3"
 		BufferSecurityCheck="true"
 		EnableFunctionLevelLinking="true"
 		DebugInformationFormat="4"
-        EnablePREfast="true"
+		EnablePREfast="true"
 	/>
 	<Tool
 		Name="VCLinkerTool"