- Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.

- Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
- Simplified the MSVC9 <-> MSVC8 conversion tools a bit

svn-id: r42288

1 files changed, 0 insertions, 613 deletions

diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
deleted file mode 100644
index 9d8e22eff6..0000000000
--- a/dists/msvc7/scumm.vcproj
+++ /dev/null
@@ -1,613 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7,00"
-	Name="scumm"
-	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="scumm_Debug"
-			IntermediateDirectory="scumm_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;ENABLE_SCUMM_7_8;ENABLE_HE;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="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="scumm_Release"
-			IntermediateDirectory="scumm_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;ENABLE_SCUMM_7_8;ENABLE_HE;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)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="smush">
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\channel.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\chunk_type.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec1.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec37.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\codec47.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_font.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\smush\smush_player.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse_digi">
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="insane">
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="he">
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\animation_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\cup_player_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\floodfill_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\intern_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\logic_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\palette_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\resource_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v100he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v60he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v70he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v71he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v72he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v80he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\script_v90he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sound_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\sprite_he.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\he\wiz_he.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="imuse">
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_part.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\instrument.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\engines\scumm\actor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\actor.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\akos.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\base-costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\bomp.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\boxes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\camera.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset-fontdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\charset.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\costume.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\cursor.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\debugger.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\detection_tables.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\dialogs.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\file_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\gfx.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\help.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\input.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\intern.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\midiparser_ro.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\music.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\nut_renderer.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\object.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\palette.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_mod.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_nes.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v1.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v2cms.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\player_v3a.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\room.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\saveload.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v0.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v3.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v4.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v5.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v6.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v8.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm-md5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v0.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v2.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v3.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v4.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v5.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v6.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v7.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\scumm_v8.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sound.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\string.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\usage_bits.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\util.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\vars.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\verbs.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>