shithub: choc

Download patch

ref: a8df85b3c6c01d4446b307298f34cd886d606c57
parent: 2ec25b9ab94916c3dc953b0c7b24a0f6c1a5ea4e
author: James Haley <[email protected]>
date: Thu Feb 9 21:50:59 EST 2012

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

--- a/msvc/libopl.vcproj
+++ b/msvc/libopl.vcproj
@@ -103,8 +103,11 @@
 			<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"
@@ -111,7 +114,8 @@
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				WarningLevel="3"
 				DebugInformationFormat="0"
 				CompileAs="1"
--- 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"
--- a/msvc/libtextscreen.vcproj
+++ b/msvc/libtextscreen.vcproj
@@ -103,8 +103,11 @@
 			<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"
@@ -111,7 +114,8 @@
 				MinimalRebuild="false"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				WarningLevel="0"
 				DebugInformationFormat="0"
 				CompileAs="1"
--- 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"