From 84b97066a3d77cfcd6aa040e95b9930015e6751b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 8 Sep 2008 13:00:43 +0000
Subject: Some more unification of options: - AdditionalIncludeDirectories is
 set to "../../;../../engines" - InlineFunctionExpansion is set to "0" for
 debug and "2" for release builds - DisableLanguageExtensions is set to
 "false" (disabling language extensions leads to some very weird errors) -
 Detect64BitPortabilityProblems is set to "false", as setting it to "true"
 throws loads of warnings too (mainly related to strlen, when trying to store
 its result in an integer)

svn-id: r34448
---
 dists/msvc7/scumm.vcproj | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'dists/msvc7/scumm.vcproj')

diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index 28c144d68a..291748f467 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -20,7 +20,8 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
 				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="../../;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -28,10 +29,13 @@
 				RuntimeLibrary="1"
 				BufferSecurityCheck="TRUE"
 				EnableFunctionLevelLinking="TRUE"
+				DisableLanguageExtensions="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -62,11 +66,11 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
 				Optimization="3"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../..;../../engines"
+				AdditionalIncludeDirectories="../../;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
@@ -77,6 +81,7 @@
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
+				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
-- 
cgit v1.2.3