diff options
-rw-r--r-- | dists/msvc8/common.vcproj | 980 | ||||
-rw-r--r-- | dists/msvc8/gob.vcproj | 36 | ||||
-rw-r--r-- | dists/msvc8/kyra.vcproj | 36 | ||||
-rw-r--r-- | dists/msvc8/queen.vcproj | 36 | ||||
-rw-r--r-- | dists/msvc8/saga.vcproj | 44 | ||||
-rw-r--r-- | dists/msvc8/scumm.vcproj | 42 | ||||
-rw-r--r-- | dists/msvc8/scummvm.sln | 26 | ||||
-rw-r--r-- | dists/msvc8/scummvm.vcproj | 871 | ||||
-rw-r--r-- | dists/msvc8/simon.vcproj | 38 | ||||
-rw-r--r-- | dists/msvc8/sky.vcproj | 38 | ||||
-rw-r--r-- | dists/msvc8/sword1.vcproj | 36 | ||||
-rw-r--r-- | dists/msvc8/sword2.vcproj | 36 |
12 files changed, 1216 insertions, 1003 deletions
diff --git a/dists/msvc8/common.vcproj b/dists/msvc8/common.vcproj new file mode 100644 index 0000000000..3bb3865738 --- /dev/null +++ b/dists/msvc8/common.vcproj @@ -0,0 +1,980 @@ +<?xml version="1.0" encoding="windows-1250"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="common" + ProjectGUID="{597FE83A-0345-4D75-98F8-30E8B6FC56C9}" + Keyword="Win32Proj" + SignManifests="true" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="common_Debug" + IntermediateDirectory="common_Debug" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" + Optimization="0" + AdditionalIncludeDirectories="../../;../../common" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + SuppressStartupBanner="false" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="common_Release" + IntermediateDirectory="common_Release" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" + AdditionalIncludeDirectories="../../;../../common" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU" + StringPooling="true" + MinimalRebuild="false" + ExceptionHandling="1" + RuntimeLibrary="0" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + DebugInformationFormat="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="base" + > + <File + RelativePath="..\..\base\engine.cpp" + > + </File> + <File + RelativePath="..\..\base\engine.h" + > + </File> + <File + RelativePath="..\..\base\gameDetector.cpp" + > + </File> + <File + RelativePath="..\..\base\gameDetector.h" + > + </File> + <File + RelativePath="..\..\base\plugins.cpp" + > + </File> + <File + RelativePath="..\..\base\plugins.h" + > + </File> + <File + RelativePath="..\..\base\version.h" + > + </File> + </Filter> + <Filter + Name="common" + > + <File + RelativePath="..\..\common\array.h" + > + </File> + <File + RelativePath="..\..\common\config-file.cpp" + > + </File> + <File + RelativePath="..\..\common\config-file.h" + > + </File> + <File + RelativePath="..\..\common\config-manager.cpp" + > + </File> + <File + RelativePath="..\..\common\config-manager.h" + > + </File> + <File + RelativePath="..\..\common\debugger.cpp" + > + </File> + <File + RelativePath="..\..\common\debugger.h" + > + </File> + <File + RelativePath="..\..\common\file.cpp" + > + </File> + <File + RelativePath="..\..\common\file.h" + > + </File> + <File + RelativePath="..\..\common\list.h" + > + </File> + <File + RelativePath="..\..\common\map.h" + > + </File> + <File + RelativePath="..\..\common\md5.cpp" + > + </File> + <File + RelativePath="..\..\common\md5.h" + > + </File> + <File + RelativePath="..\..\common\mutex.cpp" + > + </File> + <File + RelativePath="..\..\common\mutex.h" + > + </File> + <File + RelativePath="..\..\common\rect.h" + > + </File> + <File + RelativePath="..\..\common\savefile.cpp" + > + </File> + <File + RelativePath="..\..\common\savefile.h" + > + </File> + <File + RelativePath="..\..\common\scaler.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler.h" + > + </File> + <File + RelativePath="..\..\common\scummsys.h" + > + </File> + <File + RelativePath="..\..\common\singleton.h" + > + </File> + <File + RelativePath="..\..\common\stack.h" + > + </File> + <File + RelativePath="..\..\common\stdafx.h" + > + </File> + <File + RelativePath="..\..\common\str.cpp" + > + </File> + <File + RelativePath="..\..\common\str.h" + > + </File> + <File + RelativePath="..\..\common\stream.cpp" + > + </File> + <File + RelativePath="..\..\common\stream.h" + > + </File> + <File + RelativePath="..\..\common\system.cpp" + > + </File> + <File + RelativePath="..\..\common\system.h" + > + </File> + <File + RelativePath="..\..\common\timer.cpp" + > + </File> + <File + RelativePath="..\..\common\timer.h" + > + </File> + <File + RelativePath="..\..\common\util.cpp" + > + </File> + <File + RelativePath="..\..\common\util.h" + > + </File> + <Filter + Name="scaler" + > + <File + RelativePath="..\..\common\scaler\2xsai.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\aspect.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\hq2x.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\hq2x.h" + > + </File> + <File + RelativePath="..\..\common\scaler\hq2x_i386.asm" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
" + Outputs="$(OutDir)\$(InputName).obj" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
" + Outputs="$(OutDir)\$(InputName).obj" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\common\scaler\hq3x.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\hq3x.h" + > + </File> + <File + RelativePath="..\..\common\scaler\hq3x_i386.asm" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
" + Outputs="$(OutDir)\$(InputName).obj" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
" + Outputs="$(OutDir)\$(InputName).obj" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\common\scaler\intern.h" + > + </File> + <File + RelativePath="..\..\common\scaler\scale2x.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\scale2x.h" + > + </File> + <File + RelativePath="..\..\common\scaler\scale3x.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\scale3x.h" + > + </File> + <File + RelativePath="..\..\common\scaler\scalebit.cpp" + > + </File> + <File + RelativePath="..\..\common\scaler\scalebit.h" + > + </File> + <File + RelativePath="..\..\common\scaler\thumbnail.cpp" + > + </File> + </Filter> + </Filter> + <Filter + Name="sound" + > + <File + RelativePath="..\..\sound\adpcm.cpp" + > + </File> + <File + RelativePath="..\..\sound\adpcm.h" + > + </File> + <File + RelativePath="..\..\sound\audiocd.cpp" + > + </File> + <File + RelativePath="..\..\sound\audiocd.h" + > + </File> + <File + RelativePath="..\..\sound\audiostream.cpp" + > + </File> + <File + RelativePath="..\..\sound\audiostream.h" + > + </File> + <File + RelativePath="..\..\sound\flac.cpp" + > + </File> + <File + RelativePath="..\..\sound\flac.h" + > + </File> + <File + RelativePath="..\..\sound\fmopl.cpp" + > + </File> + <File + RelativePath="..\..\sound\fmopl.h" + > + </File> + <File + RelativePath="..\..\sound\mididrv.cpp" + > + </File> + <File + RelativePath="..\..\sound\mididrv.h" + > + </File> + <File + RelativePath="..\..\sound\midiparser.cpp" + > + </File> + <File + RelativePath="..\..\sound\midiparser.h" + > + </File> + <File + RelativePath="..\..\sound\midiparser_smf.cpp" + > + </File> + <File + RelativePath="..\..\sound\midiparser_xmidi.cpp" + > + </File> + <File + RelativePath="..\..\sound\mixer.cpp" + > + </File> + <File + RelativePath="..\..\sound\mixer.h" + > + </File> + <File + RelativePath="..\..\sound\mp3.cpp" + > + </File> + <File + RelativePath="..\..\sound\mp3.h" + > + </File> + <File + RelativePath="..\..\sound\mpu401.cpp" + > + </File> + <File + RelativePath="..\..\sound\mpu401.h" + > + </File> + <File + RelativePath="..\..\sound\rate.cpp" + > + </File> + <File + RelativePath="..\..\sound\rate.h" + > + </File> + <File + RelativePath="..\..\sound\voc.cpp" + > + </File> + <File + RelativePath="..\..\sound\voc.h" + > + </File> + <File + RelativePath="..\..\sound\vorbis.cpp" + > + </File> + <File + RelativePath="..\..\sound\vorbis.h" + > + </File> + <File + RelativePath="..\..\sound\wave.cpp" + > + </File> + <File + RelativePath="..\..\sound\wave.h" + > + </File> + <Filter + Name="softhsynth" + > + <File + RelativePath="..\..\sound\softsynth\adlib.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\sound\softsynth\emumidi.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\fluidsynth.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\sound\softsynth\ym2612.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)/$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <Filter + Name="mt32" + > + <File + RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\freeverb.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\i386.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\i386.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\part.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\part.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\partial.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\partial.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\partialManager.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\structures.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\synth.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\synth.h" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\tables.cpp" + > + </File> + <File + RelativePath="..\..\sound\softsynth\mt32\tables.h" + > + </File> + </Filter> + </Filter> + </Filter> + <Filter + Name="backends" + > + <File + RelativePath="..\..\backends\intern.h" + > + </File> + <Filter + Name="sdl" + > + <File + RelativePath="..\..\backends\sdl\events.cpp" + > + </File> + <File + RelativePath="..\..\backends\sdl\graphics.cpp" + > + </File> + <File + RelativePath="..\..\backends\sdl\sdl-common.h" + > + </File> + <File + RelativePath="..\..\backends\sdl\sdl.cpp" + > + </File> + </Filter> + <Filter + Name="fs" + > + <File + RelativePath="..\..\backends\fs\fs.cpp" + > + </File> + <File + RelativePath="..\..\backends\fs\fs.h" + > + </File> + <File + RelativePath="..\..\backends\fs\windows\windows-fs.cpp" + > + </File> + </Filter> + <Filter + Name="midi" + > + <File + RelativePath="..\..\backends\midi\null.cpp" + > + </File> + <File + RelativePath="..\..\backends\midi\windows.cpp" + > + </File> + </Filter> + </Filter> + <Filter + Name="gui" + > + <File + RelativePath="..\..\gui\about.cpp" + > + </File> + <File + RelativePath="..\..\gui\about.h" + > + </File> + <File + RelativePath="..\..\gui\browser.cpp" + > + </File> + <File + RelativePath="..\..\gui\browser.h" + > + </File> + <File + RelativePath="..\..\gui\chooser.cpp" + > + </File> + <File + RelativePath="..\..\gui\chooser.h" + > + </File> + <File + RelativePath="..\..\gui\console.cpp" + > + </File> + <File + RelativePath="..\..\gui\console.h" + > + </File> + <File + RelativePath="..\..\gui\credits.h" + > + </File> + <File + RelativePath="..\..\gui\dialog.cpp" + > + </File> + <File + RelativePath="..\..\gui\dialog.h" + > + </File> + <File + RelativePath="..\..\gui\editable.cpp" + > + </File> + <File + RelativePath="..\..\gui\editable.h" + > + </File> + <File + RelativePath="..\..\gui\EditTextWidget.cpp" + > + </File> + <File + RelativePath="..\..\gui\EditTextWidget.h" + > + </File> + <File + RelativePath="..\..\gui\launcher.cpp" + > + </File> + <File + RelativePath="..\..\gui\launcher.h" + > + </File> + <File + RelativePath="..\..\gui\ListWidget.cpp" + > + </File> + <File + RelativePath="..\..\gui\ListWidget.h" + > + </File> + <File + RelativePath="..\..\gui\message.cpp" + > + </File> + <File + RelativePath="..\..\gui\message.h" + > + </File> + <File + RelativePath="..\..\gui\newgui.cpp" + > + </File> + <File + RelativePath="..\..\gui\newgui.h" + > + </File> + <File + RelativePath="..\..\gui\object.h" + > + </File> + <File + RelativePath="..\..\gui\options.cpp" + > + </File> + <File + RelativePath="..\..\gui\options.h" + > + </File> + <File + RelativePath="..\..\gui\PopUpWidget.cpp" + > + </File> + <File + RelativePath="..\..\gui\PopUpWidget.h" + > + </File> + <File + RelativePath="..\..\gui\ScrollBarWidget.cpp" + > + </File> + <File + RelativePath="..\..\gui\ScrollBarWidget.h" + > + </File> + <File + RelativePath="..\..\gui\TabWidget.cpp" + > + </File> + <File + RelativePath="..\..\gui\TabWidget.h" + > + </File> + <File + RelativePath="..\..\gui\walkthrough.h" + > + </File> + <File + RelativePath="..\..\gui\widget.cpp" + > + </File> + <File + RelativePath="..\..\gui\widget.h" + > + </File> + </Filter> + <Filter + Name="graphics" + > + <File + RelativePath="..\..\graphics\animation.cpp" + > + </File> + <File + RelativePath="..\..\graphics\animation.h" + > + </File> + <File + RelativePath="..\..\graphics\consolefont.cpp" + > + </File> + <File + RelativePath="..\..\graphics\font.cpp" + > + </File> + <File + RelativePath="..\..\graphics\font.h" + > + </File> + <File + RelativePath="..\..\graphics\fontman.cpp" + > + </File> + <File + RelativePath="..\..\graphics\fontman.h" + > + </File> + <File + RelativePath="..\..\graphics\newfont.cpp" + > + </File> + <File + RelativePath="..\..\graphics\newfont_big.cpp" + > + </File> + <File + RelativePath="..\..\graphics\primitives.cpp" + > + </File> + <File + RelativePath="..\..\graphics\primitives.h" + > + </File> + <File + RelativePath="..\..\graphics\scummfont.cpp" + > + </File> + <File + RelativePath="..\..\graphics\surface.cpp" + > + </File> + <File + RelativePath="..\..\graphics\surface.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj index e23648ec2b..3fc16aa5e2 100644 --- a/dists/msvc8/gob.vcproj +++ b/dists/msvc8/gob.vcproj @@ -5,6 +5,7 @@ Name="gob" ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj index 40cf0bac4d..0c51c91b1e 100644 --- a/dists/msvc8/kyra.vcproj +++ b/dists/msvc8/kyra.vcproj @@ -5,6 +5,7 @@ Name="kyra" ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/queen.vcproj b/dists/msvc8/queen.vcproj index 7c79b17248..b39e665f27 100644 --- a/dists/msvc8/queen.vcproj +++ b/dists/msvc8/queen.vcproj @@ -5,6 +5,7 @@ Name="queen" ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/saga.vcproj b/dists/msvc8/saga.vcproj index 6a97832270..32332b1d11 100644 --- a/dists/msvc8/saga.vcproj +++ b/dists/msvc8/saga.vcproj @@ -5,6 +5,7 @@ Name="saga" ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -287,6 +289,14 @@ > </File> <File + RelativePath="..\..\saga\puzzle.cpp" + > + </File> + <File + RelativePath="..\..\saga\puzzle.h" + > + </File> + <File RelativePath="..\..\saga\render.cpp" > </File> diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj index 2a5dc6cfb5..c9787b8778 100644 --- a/dists/msvc8/scumm.vcproj +++ b/dists/msvc8/scumm.vcproj @@ -5,6 +5,7 @@ Name="scumm" ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,21 +109,23 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - DisableLanguageExtensions="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -149,7 +151,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -576,6 +578,10 @@ > </File> <File + RelativePath="..\..\scumm\script_c64.cpp" + > + </File> + <File RelativePath="..\..\scumm\script_v100he.cpp" > </File> diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln index 2e9c106952..ecd350bfb9 100644 --- a/dists/msvc8/scummvm.sln +++ b/dists/msvc8/scummvm.sln @@ -2,14 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}" ProjectSection(ProjectDependencies) = postProject - {6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF} - {C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979} - {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF} - {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} - {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} - {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} - {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} - {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} + {597FE83A-0345-4D75-98F8-30E8B6FC56C9} = {597FE83A-0345-4D75-98F8-30E8B6FC56C9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}" @@ -30,6 +23,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D947A-A45F-4437-991E-412F695C64C7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{597FE83A-0345-4D75-98F8-30E8B6FC56C9}" + ProjectSection(ProjectDependencies) = postProject + {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} + {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} + {976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7} + {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} + {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} + {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A} + {B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF} + {C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979} + {6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -76,6 +82,10 @@ Global {976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.Build.0 = Debug|Win32 {976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.ActiveCfg = Release|Win32 {976D947A-A45F-4437-991E-412F695C64C7}.Release|Win32.Build.0 = Release|Win32 + {597FE83A-0345-4D75-98F8-30E8B6FC56C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {597FE83A-0345-4D75-98F8-30E8B6FC56C9}.Debug|Win32.Build.0 = Debug|Win32 + {597FE83A-0345-4D75-98F8-30E8B6FC56C9}.Release|Win32.ActiveCfg = Release|Win32 + {597FE83A-0345-4D75-98F8-30E8B6FC56C9}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index ea5ee2f64f..7e514d9861 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -5,6 +5,7 @@ Name="scummvm" ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,18 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" - RuntimeTypeInfo="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -67,11 +66,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib sdl.lib zlibwapi.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib" + AdditionalDependencies="winmm.lib sdl.lib zlibwapi.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib common_debug/common.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="2" IgnoreDefaultLibraryNames="LIBC.lib" - GenerateDebugInformation="TRUE" + GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/scummvm.pdb" SubSystem="1" TargetMachine="1" @@ -89,6 +88,9 @@ Name="VCBscMakeTool" /> <Tool + Name="VCFxCopTool" + /> + <Tool Name="VCAppVerifierTool" /> <Tool @@ -123,22 +125,24 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ZLIB_WINAPI;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU" - StringPooling="TRUE" - MinimalRebuild="FALSE" + StringPooling="true" + MinimalRebuild="false" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" - RuntimeTypeInfo="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -155,9 +159,9 @@ AdditionalDependencies="winmm.lib sdl.lib zlibwapi.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib" OutputFile="$(OutDir)/scummvm.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBC.lib" - GenerateDebugInformation="FALSE" + GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -176,6 +180,9 @@ Name="VCBscMakeTool" /> <Tool + Name="VCFxCopTool" + /> + <Tool Name="VCAppVerifierTool" /> <Tool @@ -190,564 +197,6 @@ </References> <Files> <Filter - Name="base" - > - <File - RelativePath="..\..\base\engine.cpp" - > - </File> - <File - RelativePath="..\..\base\engine.h" - > - </File> - <File - RelativePath="..\..\base\gameDetector.cpp" - > - </File> - <File - RelativePath="..\..\base\gameDetector.h" - > - </File> - <File - RelativePath="..\..\base\main.cpp" - > - </File> - <File - RelativePath="..\..\base\plugins.cpp" - > - </File> - <File - RelativePath="..\..\base\plugins.h" - > - </File> - <File - RelativePath="..\..\base\version.h" - > - </File> - </Filter> - <Filter - Name="common" - > - <File - RelativePath="..\..\common\array.h" - > - </File> - <File - RelativePath="..\..\common\config-file.cpp" - > - </File> - <File - RelativePath="..\..\common\config-file.h" - > - </File> - <File - RelativePath="..\..\common\config-manager.cpp" - > - </File> - <File - RelativePath="..\..\common\config-manager.h" - > - </File> - <File - RelativePath="..\..\common\debugger.cpp" - > - </File> - <File - RelativePath="..\..\common\debugger.h" - > - </File> - <File - RelativePath="..\..\common\file.cpp" - > - </File> - <File - RelativePath="..\..\common\file.h" - > - </File> - <File - RelativePath="..\..\common\list.h" - > - </File> - <File - RelativePath="..\..\common\map.h" - > - </File> - <File - RelativePath="..\..\common\md5.cpp" - > - </File> - <File - RelativePath="..\..\common\md5.h" - > - </File> - <File - RelativePath="..\..\common\mutex.cpp" - > - </File> - <File - RelativePath="..\..\common\mutex.h" - > - </File> - <File - RelativePath="..\..\common\rect.h" - > - </File> - <File - RelativePath="..\..\common\savefile.cpp" - > - </File> - <File - RelativePath="..\..\common\savefile.h" - > - </File> - <File - RelativePath="..\..\common\scaler.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler.h" - > - </File> - <File - RelativePath="..\..\common\scummsys.h" - > - </File> - <File - RelativePath="..\..\common\singleton.h" - > - </File> - <File - RelativePath="..\..\common\stack.h" - > - </File> - <File - RelativePath="..\..\common\stdafx.h" - > - </File> - <File - RelativePath="..\..\common\str.cpp" - > - </File> - <File - RelativePath="..\..\common\str.h" - > - </File> - <File - RelativePath="..\..\common\stream.cpp" - > - </File> - <File - RelativePath="..\..\common\stream.h" - > - </File> - <File - RelativePath="..\..\common\system.cpp" - > - </File> - <File - RelativePath="..\..\common\system.h" - > - </File> - <File - RelativePath="..\..\common\timer.cpp" - > - </File> - <File - RelativePath="..\..\common\timer.h" - > - </File> - <File - RelativePath="..\..\common\util.cpp" - > - </File> - <File - RelativePath="..\..\common\util.h" - > - </File> - <Filter - Name="scaler" - > - <File - RelativePath="..\..\common\scaler\2xsai.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\aspect.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\hq2x.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\hq2x.h" - > - </File> - <File - RelativePath="..\..\common\scaler\hq2x_i386.asm" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\common\scaler\hq3x.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\hq3x.h" - > - </File> - <File - RelativePath="..\..\common\scaler\hq3x_i386.asm" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)
" - Outputs="$(OutDir)\$(InputName).obj" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\common\scaler\intern.h" - > - </File> - <File - RelativePath="..\..\common\scaler\scale2x.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\scale2x.h" - > - </File> - <File - RelativePath="..\..\common\scaler\scale3x.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\scale3x.h" - > - </File> - <File - RelativePath="..\..\common\scaler\scalebit.cpp" - > - </File> - <File - RelativePath="..\..\common\scaler\scalebit.h" - > - </File> - <File - RelativePath="..\..\common\scaler\thumbnail.cpp" - > - </File> - </Filter> - </Filter> - <Filter - Name="sound" - > - <File - RelativePath="..\..\sound\adpcm.cpp" - > - </File> - <File - RelativePath="..\..\sound\adpcm.h" - > - </File> - <File - RelativePath="..\..\sound\audiocd.cpp" - > - </File> - <File - RelativePath="..\..\sound\audiocd.h" - > - </File> - <File - RelativePath="..\..\sound\audiostream.cpp" - > - </File> - <File - RelativePath="..\..\sound\audiostream.h" - > - </File> - <File - RelativePath="..\..\sound\flac.cpp" - > - </File> - <File - RelativePath="..\..\sound\flac.h" - > - </File> - <File - RelativePath="..\..\sound\fmopl.cpp" - > - </File> - <File - RelativePath="..\..\sound\fmopl.h" - > - </File> - <File - RelativePath="..\..\sound\mididrv.cpp" - > - </File> - <File - RelativePath="..\..\sound\mididrv.h" - > - </File> - <File - RelativePath="..\..\sound\midiparser.cpp" - > - </File> - <File - RelativePath="..\..\sound\midiparser.h" - > - </File> - <File - RelativePath="..\..\sound\midiparser_smf.cpp" - > - </File> - <File - RelativePath="..\..\sound\midiparser_xmidi.cpp" - > - </File> - <File - RelativePath="..\..\sound\mixer.cpp" - > - </File> - <File - RelativePath="..\..\sound\mixer.h" - > - </File> - <File - RelativePath="..\..\sound\mp3.cpp" - > - </File> - <File - RelativePath="..\..\sound\mp3.h" - > - </File> - <File - RelativePath="..\..\sound\mpu401.cpp" - > - </File> - <File - RelativePath="..\..\sound\mpu401.h" - > - </File> - <File - RelativePath="..\..\sound\rate.cpp" - > - </File> - <File - RelativePath="..\..\sound\rate.h" - > - </File> - <File - RelativePath="..\..\sound\voc.cpp" - > - </File> - <File - RelativePath="..\..\sound\voc.h" - > - </File> - <File - RelativePath="..\..\sound\vorbis.cpp" - > - </File> - <File - RelativePath="..\..\sound\vorbis.h" - > - </File> - <File - RelativePath="..\..\sound\wave.cpp" - > - </File> - <File - RelativePath="..\..\sound\wave.h" - > - </File> - <Filter - Name="softhsynth" - > - <File - RelativePath="..\..\sound\softsynth\adlib.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\softsynth\emumidi.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\fluidsynth.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\sound\softsynth\ym2612.cpp" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc" - /> - </FileConfiguration> - </File> - <Filter - Name="mt32" - > - <File - RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\freeverb.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\i386.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\i386.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\part.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\part.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partial.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partial.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\partialManager.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\structures.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\synth.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\synth.h" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\tables.cpp" - > - </File> - <File - RelativePath="..\..\sound\softsynth\mt32\tables.h" - > - </File> - </Filter> - </Filter> - </Filter> - <Filter Name="txt" > <File @@ -780,266 +229,10 @@ > </File> </Filter> - <Filter - Name="backends" - > - <File - RelativePath="..\..\backends\intern.h" - > - </File> - <Filter - Name="sdl" - > - <File - RelativePath="..\..\backends\sdl\events.cpp" - > - </File> - <File - RelativePath="..\..\backends\sdl\graphics.cpp" - > - </File> - <File - RelativePath="..\..\backends\sdl\sdl-common.h" - > - </File> - <File - RelativePath="..\..\backends\sdl\sdl.cpp" - > - </File> - </Filter> - <Filter - Name="fs" - > - <File - RelativePath="..\..\backends\fs\fs.cpp" - > - </File> - <File - RelativePath="..\..\backends\fs\fs.h" - > - </File> - <File - RelativePath="..\..\backends\fs\windows\windows-fs.cpp" - > - </File> - </Filter> - <Filter - Name="midi" - > - <File - RelativePath="..\..\backends\midi\null.cpp" - > - </File> - <File - RelativePath="..\..\backends\midi\windows.cpp" - > - </File> - </Filter> - </Filter> - <Filter - Name="gui" - > - <File - RelativePath="..\..\gui\about.cpp" - > - </File> - <File - RelativePath="..\..\gui\about.h" - > - </File> - <File - RelativePath="..\..\gui\browser.cpp" - > - </File> - <File - RelativePath="..\..\gui\browser.h" - > - </File> - <File - RelativePath="..\..\gui\chooser.cpp" - > - </File> - <File - RelativePath="..\..\gui\chooser.h" - > - </File> - <File - RelativePath="..\..\gui\console.cpp" - > - </File> - <File - RelativePath="..\..\gui\console.h" - > - </File> - <File - RelativePath="..\..\gui\credits.h" - > - </File> - <File - RelativePath="..\..\gui\dialog.cpp" - > - </File> - <File - RelativePath="..\..\gui\dialog.h" - > - </File> - <File - RelativePath="..\..\gui\editable.cpp" - > - </File> - <File - RelativePath="..\..\gui\editable.h" - > - </File> - <File - RelativePath="..\..\gui\EditTextWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\EditTextWidget.h" - > - </File> - <File - RelativePath="..\..\gui\launcher.cpp" - > - </File> - <File - RelativePath="..\..\gui\launcher.h" - > - </File> - <File - RelativePath="..\..\gui\ListWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\ListWidget.h" - > - </File> - <File - RelativePath="..\..\gui\message.cpp" - > - </File> - <File - RelativePath="..\..\gui\message.h" - > - </File> - <File - RelativePath="..\..\gui\newgui.cpp" - > - </File> - <File - RelativePath="..\..\gui\newgui.h" - > - </File> - <File - RelativePath="..\..\gui\object.h" - > - </File> - <File - RelativePath="..\..\gui\options.cpp" - > - </File> - <File - RelativePath="..\..\gui\options.h" - > - </File> - <File - RelativePath="..\..\gui\PopUpWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\PopUpWidget.h" - > - </File> - <File - RelativePath="..\..\gui\ScrollBarWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\ScrollBarWidget.h" - > - </File> - <File - RelativePath="..\..\gui\TabWidget.cpp" - > - </File> - <File - RelativePath="..\..\gui\TabWidget.h" - > - </File> - <File - RelativePath="..\..\gui\walkthrough.h" - > - </File> - <File - RelativePath="..\..\gui\widget.cpp" - > - </File> - <File - RelativePath="..\..\gui\widget.h" - > - </File> - </Filter> - <Filter - Name="graphics" + <File + RelativePath="..\..\base\main.cpp" > - <File - RelativePath="..\..\graphics\animation.cpp" - > - </File> - <File - RelativePath="..\..\graphics\animation.h" - > - </File> - <File - RelativePath="..\..\graphics\consolefont.cpp" - > - </File> - <File - RelativePath="..\..\graphics\font.cpp" - > - </File> - <File - RelativePath="..\..\graphics\font.h" - > - </File> - <File - RelativePath="..\..\graphics\fontman.cpp" - > - </File> - <File - RelativePath="..\..\graphics\fontman.h" - > - </File> - <File - RelativePath="..\..\graphics\newfont.cpp" - > - </File> - <File - RelativePath="..\..\graphics\newfont_big.cpp" - > - </File> - <File - RelativePath="..\..\graphics\primitives.cpp" - > - </File> - <File - RelativePath="..\..\graphics\primitives.h" - > - </File> - <File - RelativePath="..\..\graphics\scummfont.cpp" - > - </File> - <File - RelativePath="..\..\graphics\surface.cpp" - > - </File> - <File - RelativePath="..\..\graphics\surface.h" - > - </File> - </Filter> + </File> </Files> <Globals> </Globals> diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj index e26b4e3eca..97a93a0878 100644 --- a/dists/msvc8/simon.vcproj +++ b/dists/msvc8/simon.vcproj @@ -5,6 +5,7 @@ Name="simon" ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -89,7 +89,7 @@ OutputDirectory="simon_Release" IntermediateDirectory="simon_Release" ConfigurationType="4" - ATLMinimizesCRunTimeLibraryUsage="TRUE" + ATLMinimizesCRunTimeLibraryUsage="true" CharacterSet="2" > <Tool @@ -110,20 +110,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -149,7 +151,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/sky.vcproj b/dists/msvc8/sky.vcproj index 40d92fd9f6..335f85231b 100644 --- a/dists/msvc8/sky.vcproj +++ b/dists/msvc8/sky.vcproj @@ -5,6 +5,7 @@ Name="sky" ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,21 +109,23 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - DisableLanguageExtensions="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + DisableLanguageExtensions="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -149,7 +151,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/sword1.vcproj b/dists/msvc8/sword1.vcproj index 64ed58df2d..ca68df310c 100644 --- a/dists/msvc8/sword1.vcproj +++ b/dists/msvc8/sword1.vcproj @@ -5,6 +5,7 @@ Name="sword1" ProjectGUID="{C8AAE83E-198B-4ECA-A877-166827953979}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj index 3a05f0ece0..595fef3df3 100644 --- a/dists/msvc8/sword2.vcproj +++ b/dists/msvc8/sword2.vcproj @@ -5,6 +5,7 @@ Name="sword2" ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}" Keyword="Win32Proj" + SignManifests="true" > <Platforms> <Platform @@ -42,17 +43,16 @@ Optimization="0" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" - MinimalRebuild="TRUE" - ExceptionHandling="1" + MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" - SuppressStartupBanner="FALSE" + WarnAsError="true" + SuppressStartupBanner="false" DebugInformationFormat="4" /> <Tool @@ -78,7 +78,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" @@ -109,20 +109,22 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" + Optimization="3" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" AdditionalIncludeDirectories="../../;../../common" PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2" - StringPooling="TRUE" + StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - ForceConformanceInForLoopScope="TRUE" + BufferSecurityCheck="false" + EnableFunctionLevelLinking="false" + ForceConformanceInForLoopScope="true" UsePrecompiledHeader="0" WarningLevel="4" - WarnAsError="TRUE" + WarnAsError="true" DebugInformationFormat="0" /> <Tool @@ -148,7 +150,7 @@ Name="VCBscMakeTool" /> <Tool - Name="VCAppVerifierTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" |