diff options
Diffstat (limited to 'dists/msvc71')
-rw-r--r-- | dists/msvc71/agi.vcproj | 15 | ||||
-rw-r--r-- | dists/msvc71/agos.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/cine.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/cruise.vcproj | 20 | ||||
-rw-r--r-- | dists/msvc71/drascula.vcproj | 15 | ||||
-rw-r--r-- | dists/msvc71/gob.vcproj | 26 | ||||
-rw-r--r-- | dists/msvc71/igor.vcproj | 15 | ||||
-rw-r--r-- | dists/msvc71/kyra.vcproj | 23 | ||||
-rw-r--r-- | dists/msvc71/lure.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/m4.vcproj | 15 | ||||
-rw-r--r-- | dists/msvc71/made.vcproj | 15 | ||||
-rw-r--r-- | dists/msvc71/parallaction.vcproj | 18 | ||||
-rw-r--r-- | dists/msvc71/queen.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/saga.vcproj | 19 | ||||
-rw-r--r-- | dists/msvc71/scumm.vcproj | 26 | ||||
-rw-r--r-- | dists/msvc71/scummvm.vcproj | 66 | ||||
-rw-r--r-- | dists/msvc71/sky.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/sword1.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/sword2.vcproj | 17 | ||||
-rw-r--r-- | dists/msvc71/tinsel.vcproj | 363 | ||||
-rw-r--r-- | dists/msvc71/touche.vcproj | 15 |
21 files changed, 653 insertions, 117 deletions
diff --git a/dists/msvc71/agi.vcproj b/dists/msvc71/agi.vcproj index dc4697a4fd..de73c01ff4 100644 --- a/dists/msvc71/agi.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="agi_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/agos.vcproj b/dists/msvc71/agos.vcproj index 7f01df5f68..3bdde3b847 100644 --- a/dists/msvc71/agos.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="agos_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../..;../../engines" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS" StringPooling="TRUE" ExceptionHandling="TRUE" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/cine.vcproj b/dists/msvc71/cine.vcproj index cdea3e9fb8..8fd43a55a8 100644 --- a/dists/msvc71/cine.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="cine_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/cruise.vcproj b/dists/msvc71/cruise.vcproj index 53ed72f60e..a03a63ae4d 100644 --- a/dists/msvc71/cruise.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="cruise_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> @@ -159,9 +166,6 @@ RelativePath="..\..\engines\cruise\dataLoader.h"> </File> <File - RelativePath="..\..\engines\cruise\decompiler.cpp"> - </File> - <File RelativePath="..\..\engines\cruise\delphine-unpack.cpp"> </File> <File diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj index 9160a02bbf..72eecd1a3f 100644 --- a/dists/msvc71/drascula.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="drascula_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj index 3d6408cdf5..972e8ab12e 100644 --- a/dists/msvc71/gob.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="gob_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> @@ -282,6 +289,12 @@ RelativePath="..\..\engines\gob\inter_v4.cpp"> </File> <File + RelativePath="..\..\engines\gob\inter_v5.cpp"> + </File> + <File + RelativePath="..\..\engines\gob\inter_v6.cpp"> + </File> + <File RelativePath="..\..\engines\gob\map.cpp"> </File> <File @@ -378,6 +391,9 @@ RelativePath="..\..\engines\gob\video_v2.cpp"> </File> <File + RelativePath="..\..\engines\gob\video_v6.cpp"> + </File> + <File RelativePath="..\..\engines\gob\videoplayer.cpp"> </File> <File diff --git a/dists/msvc71/igor.vcproj b/dists/msvc71/igor.vcproj index 20324afba4..887cfe0c17 100644 --- a/dists/msvc71/igor.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="igor_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj index efc37c251e..b70f187ae9 100644 --- a/dists/msvc71/kyra.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="kyra_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> @@ -219,6 +226,12 @@ RelativePath="..\..\engines\kyra\resource.h"> </File> <File + RelativePath="..\..\engines\kyra\resource_intern.cpp"> + </File> + <File + RelativePath="..\..\engines\kyra\resource_intern.h"> + </File> + <File RelativePath="..\..\engines\kyra\saveload.cpp"> </File> <File diff --git a/dists/msvc71/lure.vcproj b/dists/msvc71/lure.vcproj index 3ca3116962..4bda34c098 100644 --- a/dists/msvc71/lure.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="lure_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/m4.vcproj b/dists/msvc71/m4.vcproj index d7aefaa439..26d18c62a1 100644 --- a/dists/msvc71/m4.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="m4_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/made.vcproj b/dists/msvc71/made.vcproj index 5d0dd621e8..a21ab9cf62 100644 --- a/dists/msvc71/made.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="made_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj index c72fb68234..22a564be40 100644 --- a/dists/msvc71/parallaction.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="parallaction_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> @@ -219,6 +226,9 @@ RelativePath="..\..\engines\parallaction\saveload.cpp"> </File> <File + RelativePath="..\..\engines\parallaction\saveload.h"> + </File> + <File RelativePath="..\..\engines\parallaction\sound.cpp"> </File> <File diff --git a/dists/msvc71/queen.vcproj b/dists/msvc71/queen.vcproj index eefa686767..063425c52a 100644 --- a/dists/msvc71/queen.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="queen_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/saga.vcproj b/dists/msvc71/saga.vcproj index 388dd64ff2..588ad2873c 100644 --- a/dists/msvc71/saga.vcproj +++ b/dists/msvc71/saga.vcproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="Windows-1252"?> +<?xml version="1.0" encoding="windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" @@ -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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="saga_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/scumm.vcproj b/dists/msvc71/scumm.vcproj index 661cc1fa19..b70e50bb05 100644 --- a/dists/msvc71/scumm.vcproj +++ b/dists/msvc71/scumm.vcproj @@ -20,7 +20,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" Optimization="0" - AdditionalIncludeDirectories="../..;../../engines" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS" MinimalRebuild="TRUE" ExceptionHandling="TRUE" @@ -28,10 +29,13 @@ RuntimeLibrary="1" BufferSecurityCheck="TRUE" EnableFunctionLevelLinking="TRUE" + DisableLanguageExtensions="FALSE" ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" SuppressStartupBanner="FALSE" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="4"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="scumm_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> @@ -119,12 +126,6 @@ RelativePath="..\..\engines\scumm\smush\channel.h"> </File> <File - RelativePath="..\..\engines\scumm\smush\chunk.cpp"> - </File> - <File - RelativePath="..\..\engines\scumm\smush\chunk.h"> - </File> - <File RelativePath="..\..\engines\scumm\smush\chunk_type.h"> </File> <File @@ -567,9 +568,6 @@ RelativePath="..\..\engines\scumm\string.cpp"> </File> <File - RelativePath="..\..\engines\scumm\thumbnail.cpp"> - </File> - <File RelativePath="..\..\engines\scumm\usage_bits.cpp"> </File> <File diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj index 6234c89dd5..0648d5a43f 100644 --- a/dists/msvc71/scummvm.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -74,14 +78,16 @@ IntermediateDirectory="scummvm_Release" ConfigurationType="1" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -94,12 +100,13 @@ RuntimeTypeInfo="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib" + AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib igor_release/igor.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib m4_release/m4.lib made_release/made.lib tinsel_release/tinsel.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" @@ -144,12 +151,6 @@ RelativePath="..\..\base\commandLine.h"> </File> <File - RelativePath="..\..\base\game.cpp"> - </File> - <File - RelativePath="..\..\base\game.h"> - </File> - <File RelativePath="..\..\base\internal_version.h"> </File> <File @@ -183,6 +184,12 @@ RelativePath="..\..\common\algorithm.h"> </File> <File + RelativePath="..\..\common\archive.cpp"> + </File> + <File + RelativePath="..\..\common\archive.h"> + </File> + <File RelativePath="..\..\common\array.h"> </File> <File @@ -273,6 +280,9 @@ RelativePath="..\..\common\ptr.h"> </File> <File + RelativePath="..\..\common\queue.h"> + </File> + <File RelativePath="..\..\common\rect.h"> </File> <File @@ -656,9 +666,6 @@ </Filter> <Filter Name="backends"> - <File - RelativePath="..\..\backends\intern.h"> - </File> <Filter Name="sdl"> <File @@ -694,11 +701,20 @@ <Filter Name="fs"> <File + RelativePath="..\..\backends\fs\abstract-fs.cpp"> + </File> + <File RelativePath="..\..\backends\fs\abstract-fs.h"> </File> <File RelativePath="..\..\backends\fs\fs-factory.h"> </File> + <File + RelativePath="..\..\backends\fs\stdiostream.cpp"> + </File> + <File + RelativePath="..\..\backends\fs\stdiostream.h"> + </File> <Filter Name="windows"> <File @@ -979,6 +995,12 @@ <File RelativePath="..\..\graphics\surface.h"> </File> + <File + RelativePath="..\..\graphics\thumbnail.cpp"> + </File> + <File + RelativePath="..\..\graphics\thumbnail.h"> + </File> <Filter Name="scaler"> <File @@ -1055,7 +1077,7 @@ RelativePath="..\..\graphics\scaler\scalebit.h"> </File> <File - RelativePath="..\..\graphics\scaler\thumbnail.cpp"> + RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp"> </File> </Filter> <Filter @@ -1077,12 +1099,24 @@ <Filter Name="engines"> <File + RelativePath="..\..\engines\dialogs.cpp"> + </File> + <File + RelativePath="..\..\engines\dialogs.h"> + </File> + <File RelativePath="..\..\engines\engine.cpp"> </File> <File RelativePath="..\..\engines\engine.h"> </File> <File + RelativePath="..\..\engines\game.cpp"> + </File> + <File + RelativePath="..\..\engines\game.h"> + </File> + <File RelativePath="..\..\engines\metaengine.h"> </File> </Filter> diff --git a/dists/msvc71/sky.vcproj b/dists/msvc71/sky.vcproj index cb8303a6b2..b49534babb 100644 --- a/dists/msvc71/sky.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="sky_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/sword1.vcproj b/dists/msvc71/sword1.vcproj index 602a5a9529..953d6ca88f 100644 --- a/dists/msvc71/sword1.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="sword1_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/sword2.vcproj b/dists/msvc71/sword2.vcproj index f97da0ea91..d758641d5b 100644 --- a/dists/msvc71/sword2.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,14 +67,16 @@ IntermediateDirectory="sword2_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + 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" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> diff --git a/dists/msvc71/tinsel.vcproj b/dists/msvc71/tinsel.vcproj new file mode 100644 index 0000000000..b8475b5866 --- /dev/null +++ b/dists/msvc71/tinsel.vcproj @@ -0,0 +1,363 @@ +<?xml version="1.0" encoding="windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="tinsel" + ProjectGUID="{22AA7760-2C91-11DD-BD0B-0800200C9A66}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="tinsel_Debug" + IntermediateDirectory="tinsel_Debug" + ConfigurationType="4" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" + Optimization="0" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="../../;../../engines" + PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" + MinimalRebuild="TRUE" + ExceptionHandling="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="TRUE" + EnableFunctionLevelLinking="TRUE" + DisableLanguageExtensions="FALSE" + ForceConformanceInForLoopScope="TRUE" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="TRUE" + SuppressStartupBanner="FALSE" + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/tinsel.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="tinsel_Release" + IntermediateDirectory="tinsel_Release" + ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="TRUE"> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" + OmitFramePointers="TRUE" + AdditionalIncludeDirectories="../../;../../engines" + PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" + StringPooling="TRUE" + ExceptionHandling="TRUE" + RuntimeLibrary="0" + BufferSecurityCheck="FALSE" + EnableFunctionLevelLinking="FALSE" + DisableLanguageExtensions="FALSE" + ForceConformanceInForLoopScope="TRUE" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="TRUE" + DebugInformationFormat="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/tinsel.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\engines\tinsel\actors.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\actors.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\anim.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\anim.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\background.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\background.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\bg.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\cliprect.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\cliprect.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\config.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\config.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\coroutine.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\cursor.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\cursor.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\debugger.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\debugger.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\detection.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\dw.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\effect.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\events.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\events.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\faders.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\faders.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\film.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\font.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\font.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\graphics.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\graphics.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\handle.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\handle.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\heapmem.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\heapmem.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\inventory.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\inventory.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\mareels.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\move.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\move.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\multiobj.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\multiobj.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\music.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\music.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\object.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\object.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\palette.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\palette.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\pcode.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\pcode.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\pdisplay.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\pid.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\play.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\polygons.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\polygons.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\rince.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\rince.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\saveload.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\savescn.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\savescn.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\scene.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\scene.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\sched.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\sched.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\scn.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\scn.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\scroll.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\scroll.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\serializer.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\sound.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\sound.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\strres.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\strres.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\text.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\text.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\timers.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\timers.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\tinlib.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\tinlib.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\tinsel.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\tinsel.h"> + </File> + <File + RelativePath="..\..\engines\tinsel\token.cpp"> + </File> + <File + RelativePath="..\..\engines\tinsel\token.h"> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/dists/msvc71/touche.vcproj b/dists/msvc71/touche.vcproj index e40e861542..bd309c5ce3 100644 --- a/dists/msvc71/touche.vcproj +++ b/dists/msvc71/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"/> <Tool Name="VCCustomBuildTool"/> @@ -63,12 +67,14 @@ IntermediateDirectory="touche_Release" ConfigurationType="4" CharacterSet="2" - WholeProgramOptimization="FALSE"> + WholeProgramOptimization="TRUE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702" - Optimization="2" - InlineFunctionExpansion="1" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="TRUE" + FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="../../;../../engines" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" @@ -81,6 +87,7 @@ ForceConformanceInForLoopScope="TRUE" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="TRUE" DebugInformationFormat="0"/> <Tool Name="VCCustomBuildTool"/> |