updated msvc7 project files

svn-id: r20625

1 files changed, 144 insertions, 134 deletions

diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index 3b9d4ae11c..195dd65f15 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -32,7 +32,6 @@
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
 			<Tool
@@ -66,7 +65,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
@@ -77,7 +76,6 @@
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -103,403 +101,415 @@
 			Name="smush"
 			Filter="">
 			<File
-				RelativePath="..\..\scumm\smush\channel.h">
+				RelativePath="..\..\engines\scumm\smush\channel.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk.cpp">
+				RelativePath="..\..\engines\scumm\smush\chunk.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk.h">
+				RelativePath="..\..\engines\scumm\smush\chunk.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk_type.h">
+				RelativePath="..\..\engines\scumm\smush\chunk_type.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec1.cpp">
+				RelativePath="..\..\engines\scumm\smush\codec1.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec37.cpp">
+				RelativePath="..\..\engines\scumm\smush\codec37.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec37.h">
+				RelativePath="..\..\engines\scumm\smush\codec37.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec47.cpp">
+				RelativePath="..\..\engines\scumm\smush\codec47.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec47.h">
+				RelativePath="..\..\engines\scumm\smush\codec47.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\imuse_channel.cpp">
+				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\saud_channel.cpp">
+				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_font.cpp">
+				RelativePath="..\..\engines\scumm\smush\smush_font.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_font.h">
+				RelativePath="..\..\engines\scumm\smush\smush_font.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_mixer.cpp">
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_mixer.h">
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_player.cpp">
+				RelativePath="..\..\engines\scumm\smush\smush_player.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_player.h">
+				RelativePath="..\..\engines\scumm\smush\smush_player.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="imuse_digi"
 			Filter="">
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse.h">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_bndmgr.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_bndmgr.h">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_codecs.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_music.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_script.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_sndmgr.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_sndmgr.h">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_tables.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_track.cpp">
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="insane"
 			Filter="">
 			<File
-				RelativePath="..\..\scumm\insane\insane.cpp">
+				RelativePath="..\..\engines\scumm\insane\insane.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane.h">
+				RelativePath="..\..\engines\scumm\insane\insane.h">
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_ben.cpp">
+				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_enemy.cpp">
+				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_iact.cpp">
+				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp">
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_scenes.cpp">
+				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\scumm\actor.cpp">
+			RelativePath="..\..\engines\scumm\actor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\actor.h">
+			RelativePath="..\..\engines\scumm\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\akos.cpp">
+			RelativePath="..\..\engines\scumm\akos.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\akos.h">
+			RelativePath="..\..\engines\scumm\akos.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\base-costume.cpp">
+			RelativePath="..\..\engines\scumm\base-costume.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\base-costume.h">
+			RelativePath="..\..\engines\scumm\base-costume.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\bomp.cpp">
+			RelativePath="..\..\engines\scumm\bomp.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\bomp.h">
+			RelativePath="..\..\engines\scumm\bomp.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\boxes.cpp">
+			RelativePath="..\..\engines\scumm\boxes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\boxes.h">
+			RelativePath="..\..\engines\scumm\boxes.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\camera.cpp">
+			RelativePath="..\..\engines\scumm\camera.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\charset.cpp">
+			RelativePath="..\..\engines\scumm\charset.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\charset.h">
+			RelativePath="..\..\engines\scumm\charset.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\costume.cpp">
+			RelativePath="..\..\engines\scumm\costume.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\costume.h">
+			RelativePath="..\..\engines\scumm\costume.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\cursor.cpp">
+			RelativePath="..\..\engines\scumm\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\debugger.cpp">
+			RelativePath="..\..\engines\scumm\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\debugger.h">
+			RelativePath="..\..\engines\scumm\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\dialogs.cpp">
+			RelativePath="..\..\engines\scumm\dialogs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\dialogs.h">
+			RelativePath="..\..\engines\scumm\dialogs.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\gfx.cpp">
+			RelativePath="..\..\engines\scumm\floodfill_he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\gfx.h">
+			RelativePath="..\..\engines\scumm\floodfill_he.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\help.cpp">
+			RelativePath="..\..\engines\scumm\gfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\help.h">
+			RelativePath="..\..\engines\scumm\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse.cpp">
+			RelativePath="..\..\engines\scumm\help.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse.h">
+			RelativePath="..\..\engines\scumm\help.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse_internal.h">
+			RelativePath="..\..\engines\scumm\imuse.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse_player.cpp">
+			RelativePath="..\..\engines\scumm\imuse.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\input.cpp">
+			RelativePath="..\..\engines\scumm\imuse_internal.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\instrument.cpp">
+			RelativePath="..\..\engines\scumm\imuse_player.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\instrument.h">
+			RelativePath="..\..\engines\scumm\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\intern.h">
+			RelativePath="..\..\engines\scumm\instrument.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\logic_he.cpp">
+			RelativePath="..\..\engines\scumm\instrument.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\logic_he.h">
+			RelativePath="..\..\engines\scumm\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\midiparser_eup.cpp">
+			RelativePath="..\..\engines\scumm\intern_he.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\midiparser_ro.cpp">
+			RelativePath="..\..\engines\scumm\logic_he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\music.h">
+			RelativePath="..\..\engines\scumm\logic_he.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\nut_renderer.cpp">
+			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\nut_renderer.h">
+			RelativePath="..\..\engines\scumm\midiparser_ro.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\object.cpp">
+			RelativePath="..\..\engines\scumm\music.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\object.h">
+			RelativePath="..\..\engines\scumm\nut_renderer.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\palette.cpp">
+			RelativePath="..\..\engines\scumm\nut_renderer.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\palette_he.cpp">
+			RelativePath="..\..\engines\scumm\object.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_mod.cpp">
+			RelativePath="..\..\engines\scumm\object.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_mod.h">
+			RelativePath="..\..\engines\scumm\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_nes.cpp">
+			RelativePath="..\..\engines\scumm\palette_he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_nes.h">
+			RelativePath="..\..\engines\scumm\player_mod.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v1.cpp">
+			RelativePath="..\..\engines\scumm\player_mod.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v1.h">
+			RelativePath="..\..\engines\scumm\player_nes.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2.cpp">
+			RelativePath="..\..\engines\scumm\player_nes.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2.h">
+			RelativePath="..\..\engines\scumm\player_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2a.cpp">
+			RelativePath="..\..\engines\scumm\player_v1.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2a.h">
+			RelativePath="..\..\engines\scumm\player_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v3a.cpp">
+			RelativePath="..\..\engines\scumm\player_v2.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v3a.h">
+			RelativePath="..\..\engines\scumm\player_v2a.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource.cpp">
+			RelativePath="..\..\engines\scumm\player_v2a.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource.h">
+			RelativePath="..\..\engines\scumm\player_v3a.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v2.cpp">
+			RelativePath="..\..\engines\scumm\player_v3a.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v3.cpp">
+			RelativePath="..\..\engines\scumm\resource.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v4.cpp">
+			RelativePath="..\..\engines\scumm\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v7he.cpp">
+			RelativePath="..\..\engines\scumm\resource_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v7he.h">
+			RelativePath="..\..\engines\scumm\resource_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\room.cpp">
+			RelativePath="..\..\engines\scumm\resource_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\saveload.cpp">
+			RelativePath="..\..\engines\scumm\resource_v7he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\saveload.h">
+			RelativePath="..\..\engines\scumm\resource_v7he.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script.cpp">
+			RelativePath="..\..\engines\scumm\room.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script.h">
+			RelativePath="..\..\engines\scumm\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_c64.cpp">
+			RelativePath="..\..\engines\scumm\saveload.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v100he.cpp">
+			RelativePath="..\..\engines\scumm\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v2.cpp">
+			RelativePath="..\..\engines\scumm\script.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v5.cpp">
+			RelativePath="..\..\engines\scumm\script_c64.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v6.cpp">
+			RelativePath="..\..\engines\scumm\script_v100he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v6he.cpp">
+			RelativePath="..\..\engines\scumm\script_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v72he.cpp">
+			RelativePath="..\..\engines\scumm\script_v5.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v7he.cpp">
+			RelativePath="..\..\engines\scumm\script_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v8.cpp">
+			RelativePath="..\..\engines\scumm\script_v6he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v80he.cpp">
+			RelativePath="..\..\engines\scumm\script_v72he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v90he.cpp">
+			RelativePath="..\..\engines\scumm\script_v7he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm-md5.h">
+			RelativePath="..\..\engines\scumm\script_v8.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm.cpp">
+			RelativePath="..\..\engines\scumm\script_v80he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm.h">
+			RelativePath="..\..\engines\scumm\script_v90he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\sound.cpp">
+			RelativePath="..\..\engines\scumm\scumm-md5.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\sound.h">
+			RelativePath="..\..\engines\scumm\scumm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\sprite_he.cpp">
+			RelativePath="..\..\engines\scumm\scumm.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\sprite_he.h">
+			RelativePath="..\..\engines\scumm\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\string.cpp">
+			RelativePath="..\..\engines\scumm\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\thumbnail.cpp">
+			RelativePath="..\..\engines\scumm\sound_he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\usage_bits.cpp">
+			RelativePath="..\..\engines\scumm\sprite_he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\usage_bits.h">
+			RelativePath="..\..\engines\scumm\sprite_he.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\util.cpp">
+			RelativePath="..\..\engines\scumm\string.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\util.h">
+			RelativePath="..\..\engines\scumm\thumbnail.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\vars.cpp">
+			RelativePath="..\..\engines\scumm\usage_bits.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\verbs.cpp">
+			RelativePath="..\..\engines\scumm\usage_bits.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\verbs.h">
+			RelativePath="..\..\engines\scumm\util.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\wiz_he.cpp">
+			RelativePath="..\..\engines\scumm\util.h">
 		</File>
 		<File
-			RelativePath="..\..\scumm\wiz_he.h">
+			RelativePath="..\..\engines\scumm\vars.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\scumm\verbs.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\scumm\verbs.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\scumm\wiz_he.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\scumm\wiz_he.h">
 		</File>
 	</Files>
 	<Globals>