foxygit / doom Log in
commit a8df85b3c6c01d4446b307298f34cd886d606c57
Author:     James Haley <haleyjd@hotmail.com>
AuthorDate: Fri Feb 10 02:50:59 2012 +0000
Commit:     James Haley <haleyjd@hotmail.com>
CommitDate: Fri Feb 10 02:50:59 2012 +0000

    Make optimization settings consistent (static libraries do not support
    function-level linking.....). Also, use similar optimizer settings to
    the ones used by Eternity (favor speed over size, intrinsics on, inline
    any suitable, link-time code generation, function-level linking *in the
    exe only*, omit frame pointers, etc.

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2499
---
 msvc/libopl.vcproj        | 8 ++++++--
 msvc/libpcsound.vcproj    | 8 +++++++-
 msvc/libtextscreen.vcproj | 8 ++++++--
 msvc/strife.vcproj        | 4 ++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/msvc/libopl.vcproj b/msvc/libopl.vcproj
index 6c651776..b0480b6c 100644
--- a/msvc/libopl.vcproj
+++ b/msvc/libopl.vcproj
@@ -103,15 +103,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="0"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..\src"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				WarningLevel="3"
 				DebugInformationFormat="0"
 				CompileAs="1"
diff --git a/msvc/libpcsound.vcproj b/msvc/libpcsound.vcproj
index da6162b5..496f1f69 100644
--- a/msvc/libpcsound.vcproj
+++ b/msvc/libpcsound.vcproj
@@ -103,11 +103,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="false"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..\src"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				WarningLevel="3"
 				DebugInformationFormat="0"
 				CompileAs="1"
diff --git a/msvc/libtextscreen.vcproj b/msvc/libtextscreen.vcproj
index 1b016597..fc68d46a 100644
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -103,15 +103,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="0"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..\src"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				WarningLevel="0"
 				DebugInformationFormat="0"
 				CompileAs="1"
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj
index c4d8f998..df74ab9d 100644
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -124,7 +124,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=".;..\src;..\src\strife;..\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"