updated msvc7 project files, it's really this time :)

svn-id: r20833

7 files changed, 455 insertions, 203 deletions

diff --git a/dists/msvc7/cine.vcproj b/dists/msvc7/cine.vcproj
new file mode 100644
index 0000000000..63c406005b
--- /dev/null
+++ b/dists/msvc7/cine.vcproj
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="cine"
+	ProjectGUID="{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="cine_Debug"
+			IntermediateDirectory="cine_Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				SuppressStartupBanner="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cine.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="cine_Release"
+			IntermediateDirectory="cine_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				StringPooling="TRUE"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cine.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<File
+			RelativePath="..\..\engines\cine\anim.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\anim.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\auto00.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\auto00.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg_list.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg_list.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\cine.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\cine.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\flip_support.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\flip_support.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\font.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\font.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\gfx.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\gfx.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\main_loop.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\main_loop.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\msg.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\msg.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\object.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\object.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\pal.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\pal.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\part.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\part.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\prc.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\prc.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\rel.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\rel.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\resource.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\resource.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\script.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\script.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sfx_player.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sfx_player.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sound_driver.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sound_driver.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\texte.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\texte.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\unpack.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\unpack.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\various.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\various.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 537043a668..001b1cab63 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -180,6 +180,12 @@
 			RelativePath="..\..\engines\gob\mult.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\mult_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\mult_v2.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\music.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index 195dd65f15..30ded0cd9d 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -211,6 +211,89 @@
 				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="he"
+			Filter="">
+			<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_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\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"
+			Filter="">
+			<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_player.cpp">
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\instrument.cpp">
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\instrument.h">
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\engines\scumm\actor.cpp">
 		</File>
@@ -272,12 +355,6 @@
 			RelativePath="..\..\engines\scumm\dialogs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\floodfill_he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\floodfill_he.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\gfx.cpp">
 		</File>
 		<File
@@ -290,39 +367,12 @@
 			RelativePath="..\..\engines\scumm\help.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\imuse.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse_internal.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse_player.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\input.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\instrument.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\instrument.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\intern_he.h">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\logic_he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\logic_he.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\midiparser_eup.cpp">
 		</File>
 		<File
@@ -347,9 +397,6 @@
 			RelativePath="..\..\engines\scumm\palette.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\palette_he.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\player_mod.cpp">
 		</File>
 		<File
@@ -401,12 +448,6 @@
 			RelativePath="..\..\engines\scumm\resource_v4.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\resource_v7he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\resource_v7he.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\room.cpp">
 		</File>
 		<File
@@ -425,9 +466,6 @@
 			RelativePath="..\..\engines\scumm\script_c64.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v100he.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\script_v2.cpp">
 		</File>
 		<File
@@ -437,24 +475,9 @@
 			RelativePath="..\..\engines\scumm\script_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v6he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v72he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v7he.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\script_v8.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\script_v80he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\script_v90he.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\scumm-md5.h">
 		</File>
 		<File
@@ -470,15 +493,6 @@
 			RelativePath="..\..\engines\scumm\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\sound_he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sprite_he.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\sprite_he.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\string.cpp">
 		</File>
 		<File
@@ -505,12 +519,6 @@
 		<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>
 	</Globals>
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
index b225aa3909..8a41edf93e 100644
--- a/dists/msvc7/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
@@ -19,21 +19,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{AA83E230-EC4A-44DF-896C-4472F20CE168}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {AA83E230-EC4A-44DF-896C-4472F20CE168}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.7 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.8 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {AA83E230-EC4A-44DF-896C-4472F20CE168}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {C8AAE83E-198B-4ECA-A877-166827953979}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.7 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.8 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.9 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32
@@ -76,6 +79,10 @@ Global
 		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Debug.Build.0 = Debug|Win32
 		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.ActiveCfg = Release|Win32
 		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.Build.0 = Release|Win32
+		{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Debug.ActiveCfg = Debug|Win32
+		{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Debug.Build.0 = Debug|Win32
+		{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Release.ActiveCfg = Release|Win32
+		{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index b08d6d44a4..7385e22e51 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.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 zdll.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 cine_debug/cine.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"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libcmtd.lib"
@@ -91,7 +91,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.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"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.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 cine_release/cine.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"
@@ -204,12 +204,6 @@
 				RelativePath="..\..\common\savefile.h">
 			</File>
 			<File
-				RelativePath="..\..\common\scaler.cpp">
-			</File>
-			<File
-				RelativePath="..\..\common\scaler.h">
-			</File>
-			<File
 				RelativePath="..\..\common\scummsys.h">
 			</File>
 			<File
@@ -257,90 +251,6 @@
 			<File
 				RelativePath="..\..\common\util.h">
 			</File>
-			<Filter
-				Name="scaler"
-				Filter="">
-				<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"
@@ -710,9 +620,6 @@
 				RelativePath="..\..\graphics\animation.h">
 			</File>
 			<File
-				RelativePath="..\..\graphics\consolefont.cpp">
-			</File>
-			<File
 				RelativePath="..\..\graphics\font.cpp">
 			</File>
 			<File
@@ -743,19 +650,16 @@
 				RelativePath="..\..\graphics\imageman.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">
+				RelativePath="..\..\graphics\scaler.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\scaler.h">
 			</File>
 			<File
 				RelativePath="..\..\graphics\surface.cpp">
@@ -763,6 +667,106 @@
 			<File
 				RelativePath="..\..\graphics\surface.h">
 			</File>
+			<Filter
+				Name="scaler"
+				Filter="">
+				<File
+					RelativePath="..\..\graphics\scaler\2xsai.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\aspect.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq2x.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq2x.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\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="..\..\graphics\scaler\hq3x.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq3x.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\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="..\..\graphics\scaler\intern.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale2x.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale2x.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale3x.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale3x.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scalebit.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scalebit.h">
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\thumbnail.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="fonts"
+				Filter="">
+				<File
+					RelativePath="..\..\graphics\fonts\consolefont.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\newfont.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\newfont_big.cpp">
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\scummfont.cpp">
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj
index 7422caebfd..9b74c45dcf 100644
--- a/dists/msvc7/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -136,6 +136,9 @@
 			RelativePath="..\..\engines\simon\midiparser_s1d.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\simon\oracle.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\res.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index cd82e5e95a..87e1627fe9 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -96,9 +96,6 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="..\..\engines\sword2\_mouse.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\animation.cpp">
 		</File>
 		<File
@@ -108,12 +105,6 @@
 			RelativePath="..\..\engines\sword2\anims.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\build_display.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\sword2\build_display.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\console.cpp">
 		</File>
 		<File
@@ -150,9 +141,6 @@
 			RelativePath="..\..\engines\sword2\icons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\icons.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\interpreter.cpp">
 		</File>
 		<File
@@ -162,9 +150,6 @@
 			RelativePath="..\..\engines\sword2\layers.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\layers.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\logic.cpp">
 		</File>
 		<File
@@ -222,10 +207,16 @@
 			RelativePath="..\..\engines\sword2\router.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\save_rest.cpp">
+			RelativePath="..\..\engines\sword2\saveload.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\sword2\saveload.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\sword2\screen.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\save_rest.h">
+			RelativePath="..\..\engines\sword2\screen.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\sword2\scroll.cpp">