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/msvc8 | |
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/msvc8')
-rw-r--r-- | dists/msvc8/agi.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/agos.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/cine.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/cruise.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/drascula.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/gob.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/igor.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/kyra.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/lure.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/m4.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/made.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/parallaction.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/queen.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/saga.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/scumm.vcproj | 9 | ||||
-rw-r--r-- | dists/msvc8/scummvm.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/sky.vcproj | 9 | ||||
-rw-r--r-- | dists/msvc8/sword1.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/sword2.vcproj | 10 | ||||
-rw-r--r-- | dists/msvc8/tinsel.vcproj | 6 | ||||
-rw-r--r-- | dists/msvc8/touche.vcproj | 6 |
21 files changed, 129 insertions, 47 deletions
diff --git a/dists/msvc8/agi.vcproj b/dists/msvc8/agi.vcproj index b0f62550e9..08d734221b 100644 --- a/dists/msvc8/agi.vcproj +++ b/dists/msvc8/agi.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/agos.vcproj b/dists/msvc8/agos.vcproj index 76ef25e3d5..3fd581a45b 100644 --- a/dists/msvc8/agos.vcproj +++ b/dists/msvc8/agos.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/cine.vcproj b/dists/msvc8/cine.vcproj index 0276a33f74..22061d57c0 100644 --- a/dists/msvc8/cine.vcproj +++ b/dists/msvc8/cine.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/cruise.vcproj b/dists/msvc8/cruise.vcproj index 94e7e3bab4..d8c81b2a01 100644 --- a/dists/msvc8/cruise.vcproj +++ b/dists/msvc8/cruise.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj index 327d6d2110..e096b33239 100644 --- a/dists/msvc8/drascula.vcproj +++ b/dists/msvc8/drascula.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj index d609f68ba1..982f7e3f0c 100644 --- a/dists/msvc8/gob.vcproj +++ b/dists/msvc8/gob.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/igor.vcproj b/dists/msvc8/igor.vcproj index e747a1c679..dbfc5cc6bc 100644 --- a/dists/msvc8/igor.vcproj +++ b/dists/msvc8/igor.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj index 03d9e9a482..8798677947 100644 --- a/dists/msvc8/kyra.vcproj +++ b/dists/msvc8/kyra.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/lure.vcproj b/dists/msvc8/lure.vcproj index ffc42673c1..5102e74117 100644 --- a/dists/msvc8/lure.vcproj +++ b/dists/msvc8/lure.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/m4.vcproj b/dists/msvc8/m4.vcproj index 52bb43dfe4..9d27e60132 100644 --- a/dists/msvc8/m4.vcproj +++ b/dists/msvc8/m4.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/made.vcproj b/dists/msvc8/made.vcproj index c9bcf055d5..13b32b61d5 100644 --- a/dists/msvc8/made.vcproj +++ b/dists/msvc8/made.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj index de786da833..ddb0a13b46 100644 --- a/dists/msvc8/parallaction.vcproj +++ b/dists/msvc8/parallaction.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/queen.vcproj b/dists/msvc8/queen.vcproj index 6ea3ea1bbc..eec37976bf 100644 --- a/dists/msvc8/queen.vcproj +++ b/dists/msvc8/queen.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/saga.vcproj b/dists/msvc8/saga.vcproj index d7e5a0a50e..bd38dbbfca 100644 --- a/dists/msvc8/saga.vcproj +++ b/dists/msvc8/saga.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj index e57e67aa16..6ad04e18ab 100644 --- a/dists/msvc8/scumm.vcproj +++ b/dists/msvc8/scumm.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,11 +115,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/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index e9ff6c8883..907b7bd2bc 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -41,7 +41,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" @@ -49,12 +50,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 @@ -130,11 +133,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" @@ -142,6 +145,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/dists/msvc8/sky.vcproj b/dists/msvc8/sky.vcproj index 644a0c1a7b..ffed869c8b 100644 --- a/dists/msvc8/sky.vcproj +++ b/dists/msvc8/sky.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,11 +115,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/msvc8/sword1.vcproj b/dists/msvc8/sword1.vcproj index 13b9ff3d13..c242a42e70 100644 --- a/dists/msvc8/sword1.vcproj +++ b/dists/msvc8/sword1.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj index c513948762..b90f38be9f 100644 --- a/dists/msvc8/sword2.vcproj +++ b/dists/msvc8/sword2.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -112,17 +115,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/msvc8/tinsel.vcproj b/dists/msvc8/tinsel.vcproj index b1295ec800..b5397681bb 100644 --- a/dists/msvc8/tinsel.vcproj +++ b/dists/msvc8/tinsel.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" diff --git a/dists/msvc8/touche.vcproj b/dists/msvc8/touche.vcproj index 14c5ada22e..d314a910da 100644 --- a/dists/msvc8/touche.vcproj +++ b/dists/msvc8/touche.vcproj @@ -41,7 +41,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" @@ -49,11 +50,13 @@ RuntimeLibrary="1" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" SuppressStartupBanner="false" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -123,6 +126,7 @@ RuntimeLibrary="0" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" |