From 0fb3f5cd0d297de8e10610e4a6cc98d9ca41af4a Mon Sep 17 00:00:00 2001
From: James Haley
Date: Thu, 5 Jun 2014 10:18:44 -0500
Subject: Make vcproj release settings consistent

Max optimization settings for release that were derived from Eternity
are now effective for all 4 games. In addition, generate map files for
debugging purposes.
---
 msvc/doom.vcproj    |  7 ++++++-
 msvc/heretic.vcproj | 14 +++++++++++---
 msvc/hexen.vcproj   | 14 +++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'msvc')

diff --git a/msvc/doom.vcproj b/msvc/doom.vcproj
index 16b6537c..7f98d3a5 100644
--- a/msvc/doom.vcproj
+++ b/msvc/doom.vcproj
@@ -123,14 +123,18 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound;..\opl"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
 			<Tool
@@ -149,6 +153,7 @@
 				LinkIncremental="0"
 				IgnoreDefaultLibraryNames="msvcrtd"
 				GenerateDebugInformation="false"
+				GenerateMapFile="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/msvc/heretic.vcproj b/msvc/heretic.vcproj
index a5f775ac..3b80ce3c 100644
--- a/msvc/heretic.vcproj
+++ b/msvc/heretic.vcproj
@@ -115,14 +115,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..\src;..\src\heretic;..\textscreen;..\pcsound;..\opl"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
-				StringPooling="true"
-				ExceptionHandling="0"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
 				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
@@ -139,11 +142,16 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
 				OutputFile="$(OutDir)\chocolate-heretic.exe"
+				LinkIncremental="0"
 				IgnoreDefaultLibraryNames="msvcrtd"
 				GenerateDebugInformation="false"
+				GenerateMapFile="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				DataExecutionPrevention="0"
+				TurnOffAssemblyGeneration="false"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/msvc/hexen.vcproj b/msvc/hexen.vcproj
index 86dc2e54..1b1e3b4e 100644
--- a/msvc/hexen.vcproj
+++ b/msvc/hexen.vcproj
@@ -116,14 +116,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..\src;..\src\hexen;..\textscreen;..\pcsound;..\opl"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
-				StringPooling="true"
-				ExceptionHandling="0"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				WarningLevel="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
 				DebugInformationFormat="0"
 				CompileAs="1"
 			/>
@@ -140,11 +143,16 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
 				OutputFile="$(OutDir)\chocolate-hexen.exe"
+				LinkIncremental="0"
 				IgnoreDefaultLibraryNames="msvcrtd"
 				GenerateDebugInformation="false"
+				GenerateMapFile="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				DataExecutionPrevention="0"
+				TurnOffAssemblyGeneration="false"
 				TargetMachine="1"
 			/>
 			<Tool
-- 
cgit v1.2.3