diff options
author | Filippos Karapetis | 2008-09-08 13:00:43 +0000 |
---|---|---|
committer | Filippos Karapetis | 2008-09-08 13:00:43 +0000 |
commit | 84b97066a3d77cfcd6aa040e95b9930015e6751b (patch) | |
tree | 6ca15a44fd7bc15cbb8fcf3e7e63ef8bc6667260 /dists/msvc9 | |
parent | 576482e91784dd3787d4da6405ad6f2ab7b481e9 (diff) | |
download | scummvm-rg350-84b97066a3d77cfcd6aa040e95b9930015e6751b.tar.gz scummvm-rg350-84b97066a3d77cfcd6aa040e95b9930015e6751b.tar.bz2 scummvm-rg350-84b97066a3d77cfcd6aa040e95b9930015e6751b.zip |
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
Diffstat (limited to 'dists/msvc9')
-rw-r--r-- | dists/msvc9/agi.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/agos.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/cine.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/cruise.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/drascula.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/gob.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/igor.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/kyra.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/lure.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/m4.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/made.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/parallaction.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/queen.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/saga.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/scumm.vcproj | 9 | ||||
-rw-r--r-- | dists/msvc9/scummvm.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/sky.vcproj | 9 | ||||
-rw-r--r-- | dists/msvc9/sword1.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/sword2.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc9/tinsel.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc9/touche.vcproj | 6 |
21 files changed, 129 insertions, 47 deletions
diff --git a/dists/msvc9/agi.vcproj b/dists/msvc9/agi.vcproj index 69f086392f..de79be933d 100644 --- a/dists/msvc9/agi.vcproj +++ b/dists/msvc9/agi.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/agos.vcproj b/dists/msvc9/agos.vcproj index 64f9e9cd80..a584d8719a 100644 --- a/dists/msvc9/agos.vcproj +++ b/dists/msvc9/agos.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/cine.vcproj b/dists/msvc9/cine.vcproj index 025a92fcae..194e792dfa 100644 --- a/dists/msvc9/cine.vcproj +++ b/dists/msvc9/cine.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/cruise.vcproj b/dists/msvc9/cruise.vcproj index 3c112197e0..c4cd6195eb 100644 --- a/dists/msvc9/cruise.vcproj +++ b/dists/msvc9/cruise.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj index 0719fc9fb4..a0ed0eaa09 100644 --- a/dists/msvc9/drascula.vcproj +++ b/dists/msvc9/drascula.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj index e7e9d5ffb4..0ebeb75f20 100644 --- a/dists/msvc9/gob.vcproj +++ b/dists/msvc9/gob.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/igor.vcproj b/dists/msvc9/igor.vcproj index 7e5405fd97..b812db787c 100644 --- a/dists/msvc9/igor.vcproj +++ b/dists/msvc9/igor.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj index 6312f99a22..e65d02f5cd 100644 --- a/dists/msvc9/kyra.vcproj +++ b/dists/msvc9/kyra.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/lure.vcproj b/dists/msvc9/lure.vcproj index 00668bf373..2915a69dbc 100644 --- a/dists/msvc9/lure.vcproj +++ b/dists/msvc9/lure.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/m4.vcproj b/dists/msvc9/m4.vcproj index af932756df..89cf4cef78 100644 --- a/dists/msvc9/m4.vcproj +++ b/dists/msvc9/m4.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/made.vcproj b/dists/msvc9/made.vcproj index 03b2140340..880b484be3 100644 --- a/dists/msvc9/made.vcproj +++ b/dists/msvc9/made.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj index ddb480cb25..5c91264919 100644 --- a/dists/msvc9/parallaction.vcproj +++ b/dists/msvc9/parallaction.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/queen.vcproj b/dists/msvc9/queen.vcproj index b567dda6eb..384cede45c 100644 --- a/dists/msvc9/queen.vcproj +++ b/dists/msvc9/queen.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/saga.vcproj b/dists/msvc9/saga.vcproj index d6e3cb4df1..241bd5b498 100644 --- a/dists/msvc9/saga.vcproj +++ b/dists/msvc9/saga.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/scumm.vcproj b/dists/msvc9/scumm.vcproj index 38c53b2074..7eafd4267f 100644 --- a/dists/msvc9/scumm.vcproj +++ b/dists/msvc9/scumm.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,11 +116,11 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj index ceff6510fe..6bf401a0b4 100644 --- a/dists/msvc9/scummvm.vcproj +++ b/dists/msvc9/scummvm.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" @@ -50,12 +51,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" /> <Tool @@ -133,11 +136,11 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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" @@ -145,6 +148,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/dists/msvc9/sky.vcproj b/dists/msvc9/sky.vcproj index c5b558e992..df74f239c2 100644 --- a/dists/msvc9/sky.vcproj +++ b/dists/msvc9/sky.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,11 +116,11 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" diff --git a/dists/msvc9/sword1.vcproj b/dists/msvc9/sword1.vcproj index c9c01a8716..d636e044e4 100644 --- a/dists/msvc9/sword1.vcproj +++ b/dists/msvc9/sword1.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/sword2.vcproj b/dists/msvc9/sword2.vcproj index acb56dae0f..fb8c4d8db1 100644 --- a/dists/msvc9/sword2.vcproj +++ b/dists/msvc9/sword2.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -113,17 +116,18 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" 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="1" RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/tinsel.vcproj b/dists/msvc9/tinsel.vcproj index af00261c21..cef9683e8b 100644 --- a/dists/msvc9/tinsel.vcproj +++ b/dists/msvc9/tinsel.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc9/touche.vcproj b/dists/msvc9/touche.vcproj index a8f870d7de..0ff5673c56 100644 --- a/dists/msvc9/touche.vcproj +++ b/dists/msvc9/touche.vcproj @@ -42,7 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="true" ExceptionHandling="1" @@ -50,11 +51,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -124,6 +127,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" |