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/agi.vcproj | 7 ++++++- dists/msvc7/agos.vcproj | 11 ++++++++--- dists/msvc7/cine.vcproj | 11 ++++++++--- dists/msvc7/cruise.vcproj | 11 ++++++++--- dists/msvc7/drascula.vcproj | 7 ++++++- dists/msvc7/gob.vcproj | 11 ++++++++--- dists/msvc7/igor.vcproj | 7 ++++++- dists/msvc7/kyra.vcproj | 11 ++++++++--- dists/msvc7/lure.vcproj | 11 ++++++++--- dists/msvc7/m4.vcproj | 7 ++++++- dists/msvc7/made.vcproj | 7 ++++++- dists/msvc7/parallaction.vcproj | 7 ++++++- dists/msvc7/queen.vcproj | 11 ++++++++--- dists/msvc7/saga.vcproj | 11 ++++++++--- dists/msvc7/scumm.vcproj | 11 ++++++++--- dists/msvc7/scummvm.vcproj | 11 ++++++++--- dists/msvc7/sky.vcproj | 11 ++++++++--- dists/msvc7/sword1.vcproj | 11 ++++++++--- dists/msvc7/sword2.vcproj | 11 ++++++++--- dists/msvc7/tinsel.vcproj | 7 ++++++- dists/msvc7/touche.vcproj | 7 ++++++- 21 files changed, 152 insertions(+), 47 deletions(-) (limited to 'dists/msvc7') diff --git a/dists/msvc7/agi.vcproj b/dists/msvc7/agi.vcproj index 41eace1317..7da2e9397d 100644 --- a/dists/msvc7/agi.vcproj +++ b/dists/msvc7/agi.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/agos.vcproj b/dists/msvc7/agos.vcproj index abf7cefdbe..5aad20fa99 100644 --- a/dists/msvc7/agos.vcproj +++ b/dists/msvc7/agos.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/cine.vcproj b/dists/msvc7/cine.vcproj index 57962bdb9c..16d0e6161f 100644 --- a/dists/msvc7/cine.vcproj +++ b/dists/msvc7/cine.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/cruise.vcproj b/dists/msvc7/cruise.vcproj index ab114ac236..24a423e737 100644 --- a/dists/msvc7/cruise.vcproj +++ b/dists/msvc7/cruise.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj index 24de5876af..7d4d55b00c 100644 --- a/dists/msvc7/drascula.vcproj +++ b/dists/msvc7/drascula.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj index 0e1234a619..99edd6deb2 100644 --- a/dists/msvc7/gob.vcproj +++ b/dists/msvc7/gob.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/igor.vcproj b/dists/msvc7/igor.vcproj index b975d90606..46af401294 100644 --- a/dists/msvc7/igor.vcproj +++ b/dists/msvc7/igor.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj index 3a1abf7869..18b42878bf 100644 --- a/dists/msvc7/kyra.vcproj +++ b/dists/msvc7/kyra.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/lure.vcproj b/dists/msvc7/lure.vcproj index 55554fac86..3e772218bc 100644 --- a/dists/msvc7/lure.vcproj +++ b/dists/msvc7/lure.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/m4.vcproj b/dists/msvc7/m4.vcproj index a57afeac48..43a563abae 100644 --- a/dists/msvc7/m4.vcproj +++ b/dists/msvc7/m4.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj index a63ec0684f..f0bec886ca 100644 --- a/dists/msvc7/made.vcproj +++ b/dists/msvc7/made.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj index 6db5ea5fc1..6547c6ccf6 100644 --- a/dists/msvc7/parallaction.vcproj +++ b/dists/msvc7/parallaction.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj index d06497b81f..bc8987ec9d 100644 --- a/dists/msvc7/queen.vcproj +++ b/dists/msvc7/queen.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj index 6719909119..6b19ea2503 100644 --- a/dists/msvc7/saga.vcproj +++ b/dists/msvc7/saga.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> 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"/> @@ -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"/> diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj index 70f062c715..34263477fe 100644 --- a/dists/msvc7/scummvm.vcproj +++ b/dists/msvc7/scummvm.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;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL" MinimalRebuild="TRUE" ExceptionHandling="TRUE" @@ -28,11 +29,14 @@ RuntimeLibrary="1" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" + DisableLanguageExtensions="FALSE" ForceConformanceInForLoopScope="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" SuppressStartupBanner="FALSE" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="4"/> @@ -73,11 +77,11 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" Optimization="3" - InlineFunctionExpansion="0" + InlineFunctionExpansion="2" EnableIntrinsicFunctions="TRUE" FavorSizeOrSpeed="2" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../..;../../engines" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL" StringPooling="TRUE" MinimalRebuild="FALSE" @@ -90,6 +94,7 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj index 8122fee1cb..16a8d000d9 100644 --- a/dists/msvc7/sky.vcproj +++ b/dists/msvc7/sky.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;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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/sword1.vcproj b/dists/msvc7/sword1.vcproj index 0a2970543b..f312bfd8c0 100644 --- a/dists/msvc7/sword1.vcproj +++ b/dists/msvc7/sword1.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;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" 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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj index a53fe9b4e4..c852510087 100644 --- a/dists/msvc7/sword2.vcproj +++ b/dists/msvc7/sword2.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;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" 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"/> @@ -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;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/tinsel.vcproj b/dists/msvc7/tinsel.vcproj index 302b175b6d..c1709e2b61 100644 --- a/dists/msvc7/tinsel.vcproj +++ b/dists/msvc7/tinsel.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;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="3"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> diff --git a/dists/msvc7/touche.vcproj b/dists/msvc7/touche.vcproj index 3b7e1bf544..983e848226 100644 --- a/dists/msvc7/touche.vcproj +++ b/dists/msvc7/touche.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;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"/> @@ -77,6 +81,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> -- cgit v1.2.3