From f087c62abaef99469f39f92e3200a4d2237b7df2 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Mon, 2 Jun 2008 19:59:23 +0000
Subject: [PATCH] Hopefully solved the <P4 crashes of the unicode build

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@952 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/mse.sln    |  1 +
 src/mse.vcproj | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/mse.sln b/src/mse.sln
index 96f7dc12..a9fbba3f 100644
--- a/src/mse.sln
+++ b/src/mse.sln
@@ -25,6 +25,7 @@ Global
 		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.ActiveCfg = Release Profile Unicode|Win32
 		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Profile Unicode.Build.0 = Release Profile Unicode|Win32
 		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.ActiveCfg = Release Unicode|Win32
+		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode.Build.0 = Release Unicode|Win32
 		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.ActiveCfg = Release Unicode fast build|Win32
 		{A78D6E04-7637-4C7A-AC63-DAAC3C4DB81B}.Release Unicode fast build.Build.0 = Release Unicode fast build|Win32
 	EndGlobalSection
diff --git a/src/mse.vcproj b/src/mse.vcproj
index e6baf074..319687c2 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -87,8 +87,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
+				InlineFunctionExpansion="0"
+				ImproveFloatingPointConsistency="FALSE"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="0"
 				OptimizeForWindowsApplication="TRUE"
@@ -226,11 +226,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="3"
 				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
-				FavorSizeOrSpeed="1"
+				InlineFunctionExpansion="0"
+				EnableIntrinsicFunctions="TRUE"
+				ImproveFloatingPointConsistency="FALSE"
+				FavorSizeOrSpeed="0"
 				OmitFramePointers="TRUE"
-				OptimizeForProcessor="3"
+				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories=".; &quot;$(WX_PATH)/include&quot;; &quot;$(WX_PATH)\lib\vc_lib\mswu&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;UNICODE;_UNICODE;wxUSE_UNICODE"
@@ -379,8 +380,8 @@
 				Optimization="3"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
-				FavorSizeOrSpeed="1"
+				ImproveFloatingPointConsistency="FALSE"
+				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
 				OptimizeForWindowsApplication="TRUE"
@@ -2366,6 +2367,12 @@
 			</File>
 			<File
 				RelativePath=".\gfx\blend_image.cpp">
+				<FileConfiguration
+					Name="Release Unicode|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\gfx\color.cpp">
@@ -2427,6 +2434,7 @@
 					Name="Release Unicode|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -2453,9 +2461,21 @@
 			</File>
 			<File
 				RelativePath=".\gfx\image_effects.cpp">
+				<FileConfiguration
+					Name="Release Unicode|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\gfx\mask_image.cpp">
+				<FileConfiguration
+					Name="Release Unicode|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\gfx\polynomial.cpp">
@@ -2465,6 +2485,12 @@
 			</File>
 			<File
 				RelativePath=".\gfx\resample_image.cpp">
+				<FileConfiguration
+					Name="Release Unicode|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\gfx\resample_text.cpp">
@@ -2478,6 +2504,7 @@
 					Name="Release Unicode|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -2505,6 +2532,7 @@
 					Name="Release Unicode|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						FavorSizeOrSpeed="1"
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -2660,6 +2688,12 @@
 				Filter="">
 				<File
 					RelativePath=".\script\context.cpp">
+					<FileConfiguration
+						Name="Release Unicode|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							FavorSizeOrSpeed="1"/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\script\context.hpp">