Replace our custom MSVC project files by automatically generated ones. Note that this is for active *testing*, I myself had not encountered any problems building a x86 and x64 binary with he msvc9 files. So if you are using MSVC, it would be nice to hear back some feedback whether it works for you or not.

svn-id: r45486

31 files changed, 1031 insertions, 649 deletions

diff --git a/dists/msvc9/ScummVM_Debug64.vsprops b/dists/msvc9/ScummVM_Debug64.vsprops
new file mode 100644
index 0000000000..a502c3d239
--- /dev/null
+++ b/dists/msvc9/ScummVM_Debug64.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Debug64"
+	InheritedPropertySheets=".\ScummVM_Global64.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		PreprocessorDefinitions="WIN32"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		EnableFunctionLevelLinking="true"
+		WarnAsError="false"
+		DebugInformationFormat="3"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="2"
+		GenerateDebugInformation="true"
+		IgnoreDefaultLibraryNames="libcmt.lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/ScummVM_Global.vsprops b/dists/msvc9/ScummVM_Global.vsprops
index f3b7158ad6..f68710f6e8 100644
--- a/dists/msvc9/ScummVM_Global.vsprops
+++ b/dists/msvc9/ScummVM_Global.vsprops
@@ -3,20 +3,20 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="ScummVM_Global"
-	OutputDirectory="$(ConfigurationName)"
-	IntermediateDirectory="$(ConfigurationName)/$(ProjectName)"
+	OutputDirectory="$(ConfigurationName)32"
+	IntermediateDirectory="$(ConfigurationName)32/$(ProjectName)"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
 		DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
-		AdditionalIncludeDirectories="../..;../../engines"
-		PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;USE_RGB_COLOR;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_GROOVIE2;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCI32;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER"
+		AdditionalIncludeDirectories="..\..;..\..\engines"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_RGB_COLOR;USE_MT32EMU;HAVE_NASM;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_GROOVIE2;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCI32;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOUCHE;ENABLE_TUCKER"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		WarningLevel="4"
-		WarnAsError="true"
+		WarnAsError="false"
 		CompileAs="0"
-	/>
+		/>
 	<Tool
 		Name="VCLibrarianTool"
 		IgnoreDefaultLibraryNames=""
@@ -27,4 +27,9 @@
 		SubSystem="1"
 		EntryPointSymbol="WinMainCRTStartup"
 	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+		PreprocessorDefinitions="HAS_INCLUDE_SET"
+		AdditionalIncludeDirectories="..\.."
+	/>
 </VisualStudioPropertySheet>
diff --git a/dists/msvc9/ScummVM_Global64.vsprops b/dists/msvc9/ScummVM_Global64.vsprops
new file mode 100644
index 0000000000..81fde05415
--- /dev/null
+++ b/dists/msvc9/ScummVM_Global64.vsprops
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Global"
+	OutputDirectory="$(ConfigurationName)64"
+	IntermediateDirectory="$(ConfigurationName)64/$(ProjectName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
+		AdditionalIncludeDirectories="..\..;..\..\engines"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_RGB_COLOR;USE_MT32EMU;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_GROOVIE2;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCI32;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOUCHE;ENABLE_TUCKER"
+		ExceptionHandling="0"
+		RuntimeTypeInfo="false"
+		WarningLevel="4"
+		WarnAsError="false"
+		CompileAs="0"
+		/>
+	<Tool
+		Name="VCLibrarianTool"
+		IgnoreDefaultLibraryNames=""
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		IgnoreDefaultLibraryNames=""
+		SubSystem="1"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+		PreprocessorDefinitions="HAS_INCLUDE_SET"
+		AdditionalIncludeDirectories="..\.."
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/ScummVM_Release64.vsprops b/dists/msvc9/ScummVM_Release64.vsprops
new file mode 100644
index 0000000000..31e85bbd52
--- /dev/null
+++ b/dists/msvc9/ScummVM_Release64.vsprops
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Release64"
+	InheritedPropertySheets=".\ScummVM_Global64.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		EnableIntrinsicFunctions="true"
+		WholeProgramOptimization="true"
+		PreprocessorDefinitions="WIN32"
+		StringPooling="true"
+		BufferSecurityCheck="false"
+		DebugInformationFormat="0"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+		IgnoreDefaultLibraryNames=""
+		SetChecksum="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/dists/msvc9/agi.vcproj b/dists/msvc9/agi.vcproj
index 5b5494cfe1..7659cbe4b4 100644
--- a/dists/msvc9/agi.vcproj
+++ b/dists/msvc9/agi.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="agi"
-	ProjectGUID="{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
+	ProjectGUID="{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}"
 	RootNamespace="agi"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\agi\agi.cpp" />
@@ -39,6 +42,7 @@
 		<File RelativePath="..\..\engines\agi\lzw.h" />
 		<File RelativePath="..\..\engines\agi\menu.cpp" />
 		<File RelativePath="..\..\engines\agi\menu.h" />
+		<File RelativePath="..\..\engines\agi\module.mk" />
 		<File RelativePath="..\..\engines\agi\motion.cpp" />
 		<File RelativePath="..\..\engines\agi\objects.cpp" />
 		<File RelativePath="..\..\engines\agi\op_cmd.cpp" />
diff --git a/dists/msvc9/agos.vcproj b/dists/msvc9/agos.vcproj
index dbcd9e412f..7e32d07634 100644
--- a/dists/msvc9/agos.vcproj
+++ b/dists/msvc9/agos.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="agos"
-	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
+	ProjectGUID="{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}"
 	RootNamespace="agos"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\agos\agos.cpp" />
@@ -43,6 +46,7 @@
 		<File RelativePath="..\..\engines\agos\midi.cpp" />
 		<File RelativePath="..\..\engines\agos\midi.h" />
 		<File RelativePath="..\..\engines\agos\midiparser_s1d.cpp" />
+		<File RelativePath="..\..\engines\agos\module.mk" />
 		<File RelativePath="..\..\engines\agos\oracle.cpp" />
 		<File RelativePath="..\..\engines\agos\pn.cpp" />
 		<File RelativePath="..\..\engines\agos\res.cpp" />
diff --git a/dists/msvc9/cine.vcproj b/dists/msvc9/cine.vcproj
index c78db8e649..a29975c276 100644
--- a/dists/msvc9/cine.vcproj
+++ b/dists/msvc9/cine.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="cine"
-	ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
+	ProjectGUID="{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}"
 	RootNamespace="cine"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\cine\anim.cpp" />
@@ -29,6 +32,7 @@
 		<File RelativePath="..\..\engines\cine\gfx.h" />
 		<File RelativePath="..\..\engines\cine\main_loop.cpp" />
 		<File RelativePath="..\..\engines\cine\main_loop.h" />
+		<File RelativePath="..\..\engines\cine\module.mk" />
 		<File RelativePath="..\..\engines\cine\msg.cpp" />
 		<File RelativePath="..\..\engines\cine\msg.h" />
 		<File RelativePath="..\..\engines\cine\object.cpp" />
diff --git a/dists/msvc9/cruise.vcproj b/dists/msvc9/cruise.vcproj
index 1a68736c66..4a4c14eff1 100644
--- a/dists/msvc9/cruise.vcproj
+++ b/dists/msvc9/cruise.vcproj
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="cruise"
-	ProjectGUID="{8863B00B-059A-471E-876D-A955ECEFD0D2}"
+	ProjectGUID="{B47BB568-D15B-46E6-9175-9980CEEAAC5A}"
 	RootNamespace="cruise"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\cruise\actor.cpp" />
@@ -34,6 +37,7 @@
 		<File RelativePath="..\..\engines\cruise\dataLoader.h" />
 		<File RelativePath="..\..\engines\cruise\debugger.cpp" />
 		<File RelativePath="..\..\engines\cruise\debugger.h" />
+		<File RelativePath="..\..\engines\cruise\decompiler.cpp" />
 		<File RelativePath="..\..\engines\cruise\delphine-unpack.cpp" />
 		<File RelativePath="..\..\engines\cruise\detection.cpp" />
 		<File RelativePath="..\..\engines\cruise\font.cpp" />
@@ -48,6 +52,7 @@
 		<File RelativePath="..\..\engines\cruise\mainDraw.h" />
 		<File RelativePath="..\..\engines\cruise\menu.cpp" />
 		<File RelativePath="..\..\engines\cruise\menu.h" />
+		<File RelativePath="..\..\engines\cruise\module.mk" />
 		<File RelativePath="..\..\engines\cruise\mouse.cpp" />
 		<File RelativePath="..\..\engines\cruise\mouse.h" />
 		<File RelativePath="..\..\engines\cruise\object.cpp" />
diff --git a/dists/msvc9/draci.vcproj b/dists/msvc9/draci.vcproj
index 67d69115a2..077056e8a3 100644
--- a/dists/msvc9/draci.vcproj
+++ b/dists/msvc9/draci.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="draci"
-	ProjectGUID="{185A2D4E-217E-402A-BECC-497D9FE58411}"
+	ProjectGUID="{C033CED3-A290-4826-841E-A045E30993F7}"
 	RootNamespace="draci"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\draci\animation.cpp" />
@@ -27,14 +30,19 @@
 		<File RelativePath="..\..\engines\draci\font.h" />
 		<File RelativePath="..\..\engines\draci\game.cpp" />
 		<File RelativePath="..\..\engines\draci\game.h" />
+		<File RelativePath="..\..\engines\draci\module.mk" />
 		<File RelativePath="..\..\engines\draci\mouse.cpp" />
 		<File RelativePath="..\..\engines\draci\mouse.h" />
 		<File RelativePath="..\..\engines\draci\music.cpp" />
 		<File RelativePath="..\..\engines\draci\music.h" />
+		<File RelativePath="..\..\engines\draci\saveload.cpp" />
+		<File RelativePath="..\..\engines\draci\saveload.h" />
 		<File RelativePath="..\..\engines\draci\screen.cpp" />
 		<File RelativePath="..\..\engines\draci\screen.h" />
 		<File RelativePath="..\..\engines\draci\script.cpp" />
 		<File RelativePath="..\..\engines\draci\script.h" />
+		<File RelativePath="..\..\engines\draci\sound.cpp" />
+		<File RelativePath="..\..\engines\draci\sound.h" />
 		<File RelativePath="..\..\engines\draci\sprite.cpp" />
 		<File RelativePath="..\..\engines\draci\sprite.h" />
 		<File RelativePath="..\..\engines\draci\surface.cpp" />
diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj
index 786436608f..7a8296c736 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="drascula"
-	ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
+	ProjectGUID="{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}"
 	RootNamespace="drascula"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\drascula\actors.cpp" />
@@ -24,6 +27,7 @@
 		<File RelativePath="..\..\engines\drascula\drascula.h" />
 		<File RelativePath="..\..\engines\drascula\graphics.cpp" />
 		<File RelativePath="..\..\engines\drascula\interface.cpp" />
+		<File RelativePath="..\..\engines\drascula\module.mk" />
 		<File RelativePath="..\..\engines\drascula\objects.cpp" />
 		<File RelativePath="..\..\engines\drascula\palette.cpp" />
 		<File RelativePath="..\..\engines\drascula\rooms.cpp" />
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index 72a9c23da6..e178bd58ce 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -3,20 +3,23 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="gob"
-	ProjectGUID="{976D947A-A45F-4437-991E-412F695C64C7}"
+	ProjectGUID="{591705A4-7876-436E-9EFB-37CB4FC04144}"
 	RootNamespace="gob"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
-		<Filter Name="demos">
+		<Filter	Name="demos">
 			<File RelativePath="..\..\engines\gob\demos\batplayer.cpp" />
 			<File RelativePath="..\..\engines\gob\demos\batplayer.h" />
 			<File RelativePath="..\..\engines\gob\demos\demoplayer.cpp" />
@@ -24,7 +27,7 @@
 			<File RelativePath="..\..\engines\gob\demos\scnplayer.cpp" />
 			<File RelativePath="..\..\engines\gob\demos\scnplayer.h" />
 		</Filter>
-		<Filter Name="save">
+		<Filter	Name="save">
 			<File RelativePath="..\..\engines\gob\save\saveconverter.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveconverter.h" />
 			<File RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp" />
@@ -37,13 +40,13 @@
 			<File RelativePath="..\..\engines\gob\save\savehandler.h" />
 			<File RelativePath="..\..\engines\gob\save\saveload.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveload.h" />
+			<File RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveload_v2.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveload_v3.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveload_v4.cpp" />
 			<File RelativePath="..\..\engines\gob\save\saveload_v6.cpp" />
-			<File RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp" />
 		</Filter>
-		<Filter Name="sound">
+		<Filter	Name="sound">
 			<File RelativePath="..\..\engines\gob\sound\adlib.cpp" />
 			<File RelativePath="..\..\engines\gob\sound\adlib.h" />
 			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp" />
@@ -116,6 +119,7 @@
 		<File RelativePath="..\..\engines\gob\map.h" />
 		<File RelativePath="..\..\engines\gob\map_v1.cpp" />
 		<File RelativePath="..\..\engines\gob\map_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\module.mk" />
 		<File RelativePath="..\..\engines\gob\mult.cpp" />
 		<File RelativePath="..\..\engines\gob\mult.h" />
 		<File RelativePath="..\..\engines\gob\mult_v1.cpp" />
diff --git a/dists/msvc9/groovie.vcproj b/dists/msvc9/groovie.vcproj
index c3ce8f0f58..23b7550723 100644
--- a/dists/msvc9/groovie.vcproj
+++ b/dists/msvc9/groovie.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="groovie"
-	ProjectGUID="{2C1EA540-0B09-11DD-BD00-000000000000}"
+	ProjectGUID="{A4146E8A-3842-4D48-B52F-928E30AA0768}"
 	RootNamespace="groovie"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\groovie\cell.cpp" />
@@ -31,6 +34,7 @@
 		<File RelativePath="..\..\engines\groovie\groovie.h" />
 		<File RelativePath="..\..\engines\groovie\lzss.cpp" />
 		<File RelativePath="..\..\engines\groovie\lzss.h" />
+		<File RelativePath="..\..\engines\groovie\module.mk" />
 		<File RelativePath="..\..\engines\groovie\music.cpp" />
 		<File RelativePath="..\..\engines\groovie\music.h" />
 		<File RelativePath="..\..\engines\groovie\player.cpp" />
@@ -40,7 +44,7 @@
 		<File RelativePath="..\..\engines\groovie\roq.cpp" />
 		<File RelativePath="..\..\engines\groovie\roq.h" />
 		<File RelativePath="..\..\engines\groovie\saveload.cpp" />
-		<File RelativePath="..\..\engines\groovie\saveload.h" />		
+		<File RelativePath="..\..\engines\groovie\saveload.h" />
 		<File RelativePath="..\..\engines\groovie\script.cpp" />
 		<File RelativePath="..\..\engines\groovie\script.h" />
 		<File RelativePath="..\..\engines\groovie\vdx.cpp" />
diff --git a/dists/msvc9/igor.vcproj b/dists/msvc9/igor.vcproj
index 0d0b8739a7..15d63df620 100644
--- a/dists/msvc9/igor.vcproj
+++ b/dists/msvc9/igor.vcproj
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="igor"
-	ProjectGUID="{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
+	ProjectGUID="{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}"
 	RootNamespace="igor"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
-		<Filter Name="parts">
+		<Filter	Name="parts">
 			<File RelativePath="..\..\engines\igor\parts\part_04.cpp" />
 			<File RelativePath="..\..\engines\igor\parts\part_05.cpp" />
 			<File RelativePath="..\..\engines\igor\parts\part_06.cpp" />
@@ -53,6 +56,7 @@
 		<File RelativePath="..\..\engines\igor\menu.cpp" />
 		<File RelativePath="..\..\engines\igor\midi.cpp" />
 		<File RelativePath="..\..\engines\igor\midi.h" />
+		<File RelativePath="..\..\engines\igor\module.mk" />
 		<File RelativePath="..\..\engines\igor\resource_ids.h" />
 		<File RelativePath="..\..\engines\igor\saveload.cpp" />
 		<File RelativePath="..\..\engines\igor\staticres.cpp" />
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index 053007fae4..b9f1507d02 100644
--- a/dists/msvc9/kyra.vcproj
+++ b/dists/msvc9/kyra.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="kyra"
-	ProjectGUID="{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
+	ProjectGUID="{862D40C6-8774-42DF-B89D-B35202B97DCB}"
 	RootNamespace="kyra"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\kyra\animator_hof.cpp" />
@@ -53,6 +56,7 @@
 		<File RelativePath="..\..\engines\kyra\kyra_v2.h" />
 		<File RelativePath="..\..\engines\kyra\lol.cpp" />
 		<File RelativePath="..\..\engines\kyra\lol.h" />
+		<File RelativePath="..\..\engines\kyra\module.mk" />
 		<File RelativePath="..\..\engines\kyra\resource.cpp" />
 		<File RelativePath="..\..\engines\kyra\resource.h" />
 		<File RelativePath="..\..\engines\kyra\resource_intern.cpp" />
@@ -100,6 +104,7 @@
 		<File RelativePath="..\..\engines\kyra\sound.cpp" />
 		<File RelativePath="..\..\engines\kyra\sound.h" />
 		<File RelativePath="..\..\engines\kyra\sound_adlib.cpp" />
+		<File RelativePath="..\..\engines\kyra\sound_adlib.h" />
 		<File RelativePath="..\..\engines\kyra\sound_amiga.cpp" />
 		<File RelativePath="..\..\engines\kyra\sound_digital.cpp" />
 		<File RelativePath="..\..\engines\kyra\sound_intern.h" />
diff --git a/dists/msvc9/lure.vcproj b/dists/msvc9/lure.vcproj
index a4590a40e7..46a87a0815 100644
--- a/dists/msvc9/lure.vcproj
+++ b/dists/msvc9/lure.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="lure"
-	ProjectGUID="{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
+	ProjectGUID="{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}"
 	RootNamespace="lure"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\lure\animseq.cpp" />
@@ -42,6 +45,7 @@
 		<File RelativePath="..\..\engines\lure\memory.h" />
 		<File RelativePath="..\..\engines\lure\menu.cpp" />
 		<File RelativePath="..\..\engines\lure\menu.h" />
+		<File RelativePath="..\..\engines\lure\module.mk" />
 		<File RelativePath="..\..\engines\lure\palette.cpp" />
 		<File RelativePath="..\..\engines\lure\palette.h" />
 		<File RelativePath="..\..\engines\lure\res.cpp" />
diff --git a/dists/msvc9/m4.vcproj b/dists/msvc9/m4.vcproj
index 3bd8fc1e5c..bb5a32c3ec 100644
--- a/dists/msvc9/m4.vcproj
+++ b/dists/msvc9/m4.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="m4"
-	ProjectGUID="{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
+	ProjectGUID="{AD84FC41-AF41-4E2B-951B-B530442F5A0C}"
 	RootNamespace="m4"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\m4\actor.cpp" />
@@ -54,6 +57,7 @@
 		<File RelativePath="..\..\engines\m4\mads_menus.h" />
 		<File RelativePath="..\..\engines\m4\midi.cpp" />
 		<File RelativePath="..\..\engines\m4\midi.h" />
+		<File RelativePath="..\..\engines\m4\module.mk" />
 		<File RelativePath="..\..\engines\m4\rails.cpp" />
 		<File RelativePath="..\..\engines\m4\rails.h" />
 		<File RelativePath="..\..\engines\m4\resource.cpp" />
@@ -64,6 +68,7 @@
 		<File RelativePath="..\..\engines\m4\scene.h" />
 		<File RelativePath="..\..\engines\m4\script.cpp" />
 		<File RelativePath="..\..\engines\m4\script.h" />
+		<File RelativePath="..\..\engines\m4\scripttab.h" />
 		<File RelativePath="..\..\engines\m4\sound.cpp" />
 		<File RelativePath="..\..\engines\m4\sound.h" />
 		<File RelativePath="..\..\engines\m4\sprite.cpp" />
diff --git a/dists/msvc9/made.vcproj b/dists/msvc9/made.vcproj
index 5272eae1b5..71e93f8b6e 100644
--- a/dists/msvc9/made.vcproj
+++ b/dists/msvc9/made.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="made"
-	ProjectGUID="{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
+	ProjectGUID="{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}"
 	RootNamespace="made"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\made\database.cpp" />
@@ -23,6 +26,7 @@
 		<File RelativePath="..\..\engines\made\graphics.h" />
 		<File RelativePath="..\..\engines\made\made.cpp" />
 		<File RelativePath="..\..\engines\made\made.h" />
+		<File RelativePath="..\..\engines\made\module.mk" />
 		<File RelativePath="..\..\engines\made\music.cpp" />
 		<File RelativePath="..\..\engines\made\music.h" />
 		<File RelativePath="..\..\engines\made\pmvplayer.cpp" />
diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj
index acefaedf41..bcd3f58a14 100644
--- a/dists/msvc9/parallaction.vcproj
+++ b/dists/msvc9/parallaction.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="parallaction"
-	ProjectGUID="{0068957B-E2E1-4988-8C87-D541D84DAF20}"
+	ProjectGUID="{82596791-5B31-48FF-999D-E6A5F45EE582}"
 	RootNamespace="parallaction"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\parallaction\balloons.cpp" />
@@ -43,6 +46,7 @@
 		<File RelativePath="..\..\engines\parallaction\input.h" />
 		<File RelativePath="..\..\engines\parallaction\inventory.cpp" />
 		<File RelativePath="..\..\engines\parallaction\inventory.h" />
+		<File RelativePath="..\..\engines\parallaction\module.mk" />
 		<File RelativePath="..\..\engines\parallaction\objects.cpp" />
 		<File RelativePath="..\..\engines\parallaction\objects.h" />
 		<File RelativePath="..\..\engines\parallaction\parallaction.cpp" />
diff --git a/dists/msvc9/queen.vcproj b/dists/msvc9/queen.vcproj
index 787cbfab93..7b770c4201 100644
--- a/dists/msvc9/queen.vcproj
+++ b/dists/msvc9/queen.vcproj
@@ -1,45 +1,49 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="queen"
-	ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
+	ProjectGUID="{38830DBF-1598-49BA-9BFF-89D3D5C223A5}"
 	RootNamespace="queen"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\queen\bankman.cpp" />
 		<File RelativePath="..\..\engines\queen\bankman.h" />
 		<File RelativePath="..\..\engines\queen\command.cpp" />
 		<File RelativePath="..\..\engines\queen\command.h" />
-		<File	RelativePath="..\..\engines\queen\credits.cpp" />
-		<File	RelativePath="..\..\engines\queen\credits.h" />
-		<File	RelativePath="..\..\engines\queen\cutaway.cpp" />
-		<File	RelativePath="..\..\engines\queen\cutaway.h" />
-		<File	RelativePath="..\..\engines\queen\debug.cpp" />
-		<File	RelativePath="..\..\engines\queen\debug.h" />
-		<File	RelativePath="..\..\engines\queen\defs.h" />
-		<File	RelativePath="..\..\engines\queen\display.cpp" />
-		<File	RelativePath="..\..\engines\queen\display.h" />
-		<File	RelativePath="..\..\engines\queen\graphics.cpp" />
-		<File	RelativePath="..\..\engines\queen\graphics.h" />
-		<File	RelativePath="..\..\engines\queen\grid.cpp" />
-		<File	RelativePath="..\..\engines\queen\grid.h" />
-		<File	RelativePath="..\..\engines\queen\input.cpp" />
-		<File	RelativePath="..\..\engines\queen\input.h" />
+		<File RelativePath="..\..\engines\queen\credits.cpp" />
+		<File RelativePath="..\..\engines\queen\credits.h" />
+		<File RelativePath="..\..\engines\queen\cutaway.cpp" />
+		<File RelativePath="..\..\engines\queen\cutaway.h" />
+		<File RelativePath="..\..\engines\queen\debug.cpp" />
+		<File RelativePath="..\..\engines\queen\debug.h" />
+		<File RelativePath="..\..\engines\queen\defs.h" />
+		<File RelativePath="..\..\engines\queen\display.cpp" />
+		<File RelativePath="..\..\engines\queen\display.h" />
+		<File RelativePath="..\..\engines\queen\graphics.cpp" />
+		<File RelativePath="..\..\engines\queen\graphics.h" />
+		<File RelativePath="..\..\engines\queen\grid.cpp" />
+		<File RelativePath="..\..\engines\queen\grid.h" />
+		<File RelativePath="..\..\engines\queen\input.cpp" />
+		<File RelativePath="..\..\engines\queen\input.h" />
 		<File RelativePath="..\..\engines\queen\journal.cpp" />
 		<File RelativePath="..\..\engines\queen\journal.h" />
 		<File RelativePath="..\..\engines\queen\logic.cpp" />
 		<File RelativePath="..\..\engines\queen\logic.h" />
 		<File RelativePath="..\..\engines\queen\midiadlib.cpp" />
+		<File RelativePath="..\..\engines\queen\module.mk" />
 		<File RelativePath="..\..\engines\queen\music.cpp" />
 		<File RelativePath="..\..\engines\queen\music.h" />
 		<File RelativePath="..\..\engines\queen\musicdata.cpp" />
diff --git a/dists/msvc9/saga.vcproj b/dists/msvc9/saga.vcproj
index 993793d7b3..bf4ad7c0d5 100644
--- a/dists/msvc9/saga.vcproj
+++ b/dists/msvc9/saga.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="saga"
-	ProjectGUID="{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
+	ProjectGUID="{675F59F8-906C-4E52-AAFB-9C5822D1E087}"
 	RootNamespace="saga"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\saga\actor.cpp" />
@@ -45,6 +48,7 @@
 		<File RelativePath="..\..\engines\saga\isomap.h" />
 		<File RelativePath="..\..\engines\saga\itedata.cpp" />
 		<File RelativePath="..\..\engines\saga\itedata.h" />
+		<File RelativePath="..\..\engines\saga\module.mk" />
 		<File RelativePath="..\..\engines\saga\music.cpp" />
 		<File RelativePath="..\..\engines\saga\music.h" />
 		<File RelativePath="..\..\engines\saga\objectmap.cpp" />
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 0c6a29dfab..fa6da43a95 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -3,20 +3,23 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="sci"
-	ProjectGUID="{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
+	ProjectGUID="{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}"
 	RootNamespace="sci"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
-		<Filter Name="engine">
+		<Filter	Name="engine">
 			<File RelativePath="..\..\engines\sci\engine\game.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\gc.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\gc.h" />
@@ -37,17 +40,18 @@
 			<File RelativePath="..\..\engines\sci\engine\kscripts.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\ksound.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\kstring.cpp" />
-			<File RelativePath="..\..\engines\sci\engine\segment.cpp" />
-			<File RelativePath="..\..\engines\sci\engine\segment.h" />
 			<File RelativePath="..\..\engines\sci\engine\message.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\message.h" />
 			<File RelativePath="..\..\engines\sci\engine\said.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\savegame.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\savegame.h" />
+			<File RelativePath="..\..\engines\sci\engine\script.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\script.h" />
 			<File RelativePath="..\..\engines\sci\engine\scriptdebug.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\seg_manager.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\seg_manager.h" />
+			<File RelativePath="..\..\engines\sci\engine\segment.cpp" />
+			<File RelativePath="..\..\engines\sci\engine\segment.h" />
 			<File RelativePath="..\..\engines\sci\engine\selector.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\state.cpp" />
 			<File RelativePath="..\..\engines\sci\engine\state.h" />
@@ -95,7 +99,7 @@
 			<File RelativePath="..\..\engines\sci\gui\gui_gfx.h" />
 			<File RelativePath="..\..\engines\sci\gui\gui_helpers.h" />
 			<File RelativePath="..\..\engines\sci\gui\gui_palette.cpp" />
-			<File RelativePath="..\..\engines\sci\gui\gui_palette.h" />	
+			<File RelativePath="..\..\engines\sci\gui\gui_palette.h" />
 			<File RelativePath="..\..\engines\sci\gui\gui_picture.cpp" />
 			<File RelativePath="..\..\engines\sci\gui\gui_picture.h" />
 			<File RelativePath="..\..\engines\sci\gui\gui_screen.cpp" />
@@ -109,17 +113,31 @@
 			<File RelativePath="..\..\engines\sci\gui\gui_windowmgr.cpp" />
 			<File RelativePath="..\..\engines\sci\gui\gui_windowmgr.h" />
 		</Filter>
-		<Filter Name="gui32">
-			<File RelativePath="..\..\engines\sci\gui32\gui32.cpp" />
-			<File RelativePath="..\..\engines\sci\gui32\gui32.h" />
+		<Filter	Name="gui32">
 			<File RelativePath="..\..\engines\sci\gui32\font.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\font.h" />
+			<File RelativePath="..\..\engines\sci\gui32\gui32.cpp" />
+			<File RelativePath="..\..\engines\sci\gui32\gui32.h" />
 			<File RelativePath="..\..\engines\sci\gui32\res_font.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\res_pal.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\res_pic.cpp" />
 			<File RelativePath="..\..\engines\sci\gui32\res_view.cpp" />
 		</Filter>
 		<Filter	Name="sfx">
+			<Filter	Name="seq">
+				<File RelativePath="..\..\engines\sci\sfx\seq\gm.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\seq\instrument-map.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\seq\instrument-map.h" />
+				<File RelativePath="..\..\engines\sci\sfx\seq\map-mt32-to-gm.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp" />
+			</Filter>
+			<Filter	Name="softseq">
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.h" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp" />
+				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h" />
+			</Filter>
 			<File RelativePath="..\..\engines\sci\sfx\core.cpp" />
 			<File RelativePath="..\..\engines\sci\sfx\core.h" />
 			<File RelativePath="..\..\engines\sci\sfx\device.h" />
@@ -127,27 +145,12 @@
 			<File RelativePath="..\..\engines\sci\sfx\iterator.h" />
 			<File RelativePath="..\..\engines\sci\sfx\iterator_internal.h" />
 			<File RelativePath="..\..\engines\sci\sfx\misc.h" />
-			<File RelativePath="..\..\engines\sci\sfx\player.h" />
 			<File RelativePath="..\..\engines\sci\sfx\sci_midi.h" />
 			<File RelativePath="..\..\engines\sci\sfx\sequencer.h" />
 			<File RelativePath="..\..\engines\sci\sfx\sfx_pcm.h" />
 			<File RelativePath="..\..\engines\sci\sfx\softseq.h" />
 			<File RelativePath="..\..\engines\sci\sfx\songlib.cpp" />
 			<File RelativePath="..\..\engines\sci\sfx\songlib.h" />
-			<Filter	Name="softseq">
-				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\softseq\adlib.h" />
-				<File RelativePath="..\..\engines\sci\sfx\softseq\amiga.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\softseq\pcjr.h" />
-			</Filter>
-			<Filter	Name="seq">
-				<File RelativePath="..\..\engines\sci\sfx\seq\gm.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\seq\instrument-map.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\seq\instrument-map.h" />
-				<File RelativePath="..\..\engines\sci\sfx\seq\map-mt32-to-gm.cpp" />
-				<File RelativePath="..\..\engines\sci\sfx\seq\sequencers.cpp" />
-			</Filter>
 		</Filter>
 		<File RelativePath="..\..\engines\sci\console.cpp" />
 		<File RelativePath="..\..\engines\sci\console.h" />
@@ -156,13 +159,13 @@
 		<File RelativePath="..\..\engines\sci\decompressor.h" />
 		<File RelativePath="..\..\engines\sci\detection.cpp" />
 		<File RelativePath="..\..\engines\sci\detection_tables.h" />
+		<File RelativePath="..\..\engines\sci\module.mk" />
 		<File RelativePath="..\..\engines\sci\resource.cpp" />
 		<File RelativePath="..\..\engines\sci\resource.h" />
 		<File RelativePath="..\..\engines\sci\sci.cpp" />
 		<File RelativePath="..\..\engines\sci\sci.h" />
 		<File RelativePath="..\..\engines\sci\seq_decoder.cpp" />
 		<File RelativePath="..\..\engines\sci\seq_decoder.h" />
-		<File RelativePath="..\..\engines\sci\engine\script.cpp" />
 		<File RelativePath="..\..\engines\sci\uinput.h" />
 		<File RelativePath="..\..\engines\sci\vocabulary.cpp" />
 		<File RelativePath="..\..\engines\sci\vocabulary.h" />
diff --git a/dists/msvc9/scumm.vcproj b/dists/msvc9/scumm.vcproj
index e261319fdb..9b891ddd59 100644
--- a/dists/msvc9/scumm.vcproj
+++ b/dists/msvc9/scumm.vcproj
@@ -3,62 +3,23 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="scumm"
-	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
+	ProjectGUID="{D222F352-BF3B-4F41-A403-9D8AFCA75266}"
 	RootNamespace="scumm"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
-
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
-		<Filter Name="smush">
-			<File RelativePath="..\..\engines\scumm\smush\channel.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\channel.h" />
-			<File RelativePath="..\..\engines\scumm\smush\chunk_type.h" />
-			<File RelativePath="..\..\engines\scumm\smush\codec1.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\codec37.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\codec37.h" />
-			<File RelativePath="..\..\engines\scumm\smush\codec47.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\codec47.h" />
-			<File RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_font.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_font.h" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.h" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_player.cpp" />
-			<File RelativePath="..\..\engines\scumm\smush\smush_player.h" />
-		</Filter>
-		<Filter Name="imuse_digi">
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" />
-			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" />
-		</Filter>
-		<Filter Name="insane">
-			<File RelativePath="..\..\engines\scumm\insane\insane.cpp" />
-			<File RelativePath="..\..\engines\scumm\insane\insane.h" />
-			<File RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" />
-			<File RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" />
-			<File RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" />
-			<File RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" />
-		</Filter>
-		<Filter Name="he">
+		<Filter	Name="he">
 			<File RelativePath="..\..\engines\scumm\he\animation_he.cpp" />
 			<File RelativePath="..\..\engines\scumm\he\animation_he.h" />
 			<File RelativePath="..\..\engines\scumm\he\cup_player_he.cpp" />
@@ -85,7 +46,7 @@
 			<File RelativePath="..\..\engines\scumm\he\wiz_he.cpp" />
 			<File RelativePath="..\..\engines\scumm\he\wiz_he.h" />
 		</Filter>
-		<Filter Name="imuse">
+		<Filter	Name="imuse">
 			<File RelativePath="..\..\engines\scumm\imuse\imuse.cpp" />
 			<File RelativePath="..\..\engines\scumm\imuse\imuse.h" />
 			<File RelativePath="..\..\engines\scumm\imuse\imuse_internal.h" />
@@ -97,6 +58,46 @@
 			<File RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp" />
 			<File RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp" />
 		</Filter>
+		<Filter	Name="imuse_digi">
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.h" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" />
+			<File RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.h" />
+		</Filter>
+		<Filter	Name="insane">
+			<File RelativePath="..\..\engines\scumm\insane\insane.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane.h" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_ben.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_iact.cpp" />
+			<File RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp" />
+		</Filter>
+		<Filter	Name="smush">
+			<File RelativePath="..\..\engines\scumm\smush\channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\channel.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec1.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec37.h" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\codec47.h" />
+			<File RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\saud_channel.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_font.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_mixer.h" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.cpp" />
+			<File RelativePath="..\..\engines\scumm\smush\smush_player.h" />
+		</Filter>
 		<File RelativePath="..\..\engines\scumm\actor.cpp" />
 		<File RelativePath="..\..\engines\scumm\actor.h" />
 		<File RelativePath="..\..\engines\scumm\akos.cpp" />
@@ -130,9 +131,9 @@
 		<File RelativePath="..\..\engines\scumm\help.cpp" />
 		<File RelativePath="..\..\engines\scumm\help.h" />
 		<File RelativePath="..\..\engines\scumm\input.cpp" />
-		<File RelativePath="..\..\engines\scumm\intern.h" />
 		<File RelativePath="..\..\engines\scumm\midiparser_eup.cpp" />
 		<File RelativePath="..\..\engines\scumm\midiparser_ro.cpp" />
+		<File RelativePath="..\..\engines\scumm\module.mk" />
 		<File RelativePath="..\..\engines\scumm\music.h" />
 		<File RelativePath="..\..\engines\scumm\nut_renderer.cpp" />
 		<File RelativePath="..\..\engines\scumm\nut_renderer.h" />
diff --git a/dists/msvc9/scummvm.sln b/dists/msvc9/scummvm.sln
index 289db86d45..d22cc81635 100644
--- a/dists/msvc9/scummvm.sln
+++ b/dists/msvc9/scummvm.sln
@@ -1,194 +1,300 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "scummvm", "scummvm.vcproj", "{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
-		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593} = {6D576A24-B9CE-11DC-BC77-8D2856D89593}
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223} = {53F17B2B-0412-4EC3-A999-ED0537BB5223}
-		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66} = {E29B5D40-08F7-11DD-BD0B-0800200C9A66}
-		{2C1EA540-0B09-11DD-BD00-000000000000} = {2C1EA540-0B09-11DD-BD00-000000000000}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
-		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66} = {22AA7760-2C91-11DD-BD0B-0800200C9A66}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{F88313A3-8D3A-4146-B38C-84CF62D84F5D} = {F88313A3-8D3A-4146-B38C-84CF62D84F5D}
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66} = {FF064FD0-AF6E-11DD-AD8B-0800200C9A66}
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
-		{185A2D4E-217E-402A-BECC-497D9FE58411} = {185A2D4E-217E-402A-BECC-497D9FE58411}
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E} = {CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831} = {0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90} = {FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A} = {B47BB568-D15B-46E6-9175-9980CEEAAC5A}
+		{C033CED3-A290-4826-841E-A045E30993F7} = {C033CED3-A290-4826-841E-A045E30993F7}
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC} = {44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}
+		{591705A4-7876-436E-9EFB-37CB4FC04144} = {591705A4-7876-436E-9EFB-37CB4FC04144}
+		{A4146E8A-3842-4D48-B52F-928E30AA0768} = {A4146E8A-3842-4D48-B52F-928E30AA0768}
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA} = {32D0DBE6-143D-4CE1-9BB5-279F61426CAA}
+		{862D40C6-8774-42DF-B89D-B35202B97DCB} = {862D40C6-8774-42DF-B89D-B35202B97DCB}
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD} = {50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C} = {AD84FC41-AF41-4E2B-951B-B530442F5A0C}
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB} = {F4446F2D-F9DD-40AF-91FA-0F621152E2CB}
+		{82596791-5B31-48FF-999D-E6A5F45EE582} = {82596791-5B31-48FF-999D-E6A5F45EE582}
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5} = {38830DBF-1598-49BA-9BFF-89D3D5C223A5}
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087} = {675F59F8-906C-4E52-AAFB-9C5822D1E087}
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7} = {3F938622-F4F5-4755-A91A-66E5D4ABCDE7}
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266} = {D222F352-BF3B-4F41-A403-9D8AFCA75266}
+		{16055389-BE24-4217-899B-5E1E272B4A37} = {16055389-BE24-4217-899B-5E1E272B4A37}
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D} = {617CC004-E2AD-4F38-A18F-5547A2FD667D}
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF} = {6001C2EE-FCBB-461B-A897-EF41384D46BF}
+		{D0F620CC-2420-4827-A883-7BD6E140FC04} = {D0F620CC-2420-4827-A883-7BD6E140FC04}
+		{914AE00F-53BD-42B3-8C04-A88267553C80} = {914AE00F-53BD-42B3-8C04-A88267553C80}
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693} = {40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167} = {A5FFC619-C5A3-4086-B396-1337DDC0B167}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "agi", "agi.vcproj", "{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "agos", "agos.vcproj", "{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "cine", "cine.vcproj", "{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "cruise", "cruise.vcproj", "{B47BB568-D15B-46E6-9175-9980CEEAAC5A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "draci", "draci.vcproj", "{C033CED3-A290-4826-841E-A045E30993F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword1", "sword1.vcproj", "{C8AAE83E-198B-4ECA-A877-166827953979}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "drascula", "drascula.vcproj", "{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "gob", "gob.vcproj", "{591705A4-7876-436E-9EFB-37CB4FC04144}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "groovie", "groovie.vcproj", "{A4146E8A-3842-4D48-B52F-928E30AA0768}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D947A-A45F-4437-991E-412F695C64C7}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "igor", "igor.vcproj", "{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "kyra", "kyra.vcproj", "{862D40C6-8774-42DF-B89D-B35202B97DCB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "lure", "lure.vcproj", "{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agi", "agi.vcproj", "{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "m4", "m4.vcproj", "{AD84FC41-AF41-4E2B-951B-B530442F5A0C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touche", "touche.vcproj", "{D4986356-D0BB-4981-924A-854157BDF11F}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "made", "made.vcproj", "{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallaction", "parallaction.vcproj", "{0068957B-E2E1-4988-8C87-D541D84DAF20}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "parallaction", "parallaction.vcproj", "{82596791-5B31-48FF-999D-E6A5F45EE582}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{8863B00B-059A-471E-876D-A955ECEFD0D2}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "queen", "queen.vcproj", "{38830DBF-1598-49BA-9BFF-89D3D5C223A5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drascula", "drascula.vcproj", "{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "saga", "saga.vcproj", "{675F59F8-906C-4E52-AAFB-9C5822D1E087}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "igor", "igor.vcproj", "{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "sci", "sci.vcproj", "{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A24-B9CE-11DC-BC77-8D2856D89593}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "scumm", "scumm.vcproj", "{D222F352-BF3B-4F41-A403-9D8AFCA75266}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "sky", "sky.vcproj", "{16055389-BE24-4217-899B-5E1E272B4A37}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "sword1", "sword1.vcproj", "{617CC004-E2AD-4F38-A18F-5547A2FD667D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tucker", "tucker.vcproj", "{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "sword2", "sword2.vcproj", "{6001C2EE-FCBB-461B-A897-EF41384D46BF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "groovie", "groovie.vcproj", "{2C1EA540-0B09-11DD-BD00-000000000000}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "teenagent", "teenagent.vcproj", "{D0F620CC-2420-4827-A883-7BD6E140FC04}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sci", "sci.vcproj", "{53F17B2B-0412-4EC3-A999-ED0537BB5223}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "tinsel", "tinsel.vcproj", "{914AE00F-53BD-42B3-8C04-A88267553C80}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "teenagent", "teenagent.vcproj", "{F88313A3-8D3A-4146-B38C-84CF62D84F5D}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "touche", "touche.vcproj", "{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "draci", "draci.vcproj", "{185A2D4E-217E-402A-BECC-497D9FE58411}"
+Project("{91916892-781B-47D4-9F2D-5543BDB474EA}") = "tucker", "tucker.vcproj", "{A5FFC619-C5A3-4086-B396-1337DDC0B167}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug|Win32.Build.0 = Debug|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.ActiveCfg = Release|Win32
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release|Win32.Build.0 = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug|Win32.Build.0 = Debug|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.ActiveCfg = Release|Win32
-		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release|Win32.Build.0 = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug|Win32.Build.0 = Debug|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.ActiveCfg = Release|Win32
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release|Win32.Build.0 = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug|Win32.Build.0 = Debug|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.ActiveCfg = Release|Win32
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release|Win32.Build.0 = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug|Win32.Build.0 = Debug|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.ActiveCfg = Release|Win32
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release|Win32.Build.0 = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug|Win32.Build.0 = Debug|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.ActiveCfg = Release|Win32
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release|Win32.Build.0 = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Debug|Win32.Build.0 = Debug|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.ActiveCfg = Release|Win32
-		{C8AAE83E-198B-4ECA-A877-166827953979}.Release|Win32.Build.0 = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Debug|Win32.Build.0 = Debug|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.ActiveCfg = Release|Win32
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}.Release|Win32.Build.0 = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug|Win32.Build.0 = Debug|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.ActiveCfg = Release|Win32
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release|Win32.Build.0 = Release|Win32
-		{976D947A-A45F-4437-991E-412F695C64C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.ActiveCfg = Release|Win32
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.Build.0 = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.Build.0 = Debug|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.ActiveCfg = Release|Win32
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.Build.0 = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Debug|Win32.Build.0 = Debug|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.ActiveCfg = Release|Win32
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}.Release|Win32.Build.0 = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Debug|Win32.Build.0 = Debug|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.ActiveCfg = Release|Win32
-		{D4986356-D0BB-4981-924A-854157BDF11F}.Release|Win32.Build.0 = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Debug|Win32.Build.0 = Debug|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.ActiveCfg = Release|Win32
-		{0068957B-E2E1-4988-8C87-D541D84DAF20}.Release|Win32.Build.0 = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.Build.0 = Debug|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.ActiveCfg = Release|Win32
-		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.Build.0 = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.Build.0 = Debug|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.ActiveCfg = Release|Win32
-		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.Build.0 = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug|Win32.Build.0 = Debug|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.ActiveCfg = Release|Win32
-		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release|Win32.Build.0 = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Debug|Win32.Build.0 = Debug|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.ActiveCfg = Release|Win32
-		{6D576A24-B9CE-11DC-BC77-8D2856D89593}.Release|Win32.Build.0 = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
-		{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Debug|Win32.Build.0 = Debug|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.ActiveCfg = Release|Win32
-		{2C1EA540-0B09-11DD-BD00-000000000000}.Release|Win32.Build.0 = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.ActiveCfg = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Debug|Win32.Build.0 = Debug|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.ActiveCfg = Release|Win32
-		{53F17B2B-0412-4EC3-A999-ED0537BB5223}.Release|Win32.Build.0 = Release|Win32
-		{F88313A3-8D3A-4146-B38C-84CF62D84F5D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F88313A3-8D3A-4146-B38C-84CF62D84F5D}.Debug|Win32.Build.0 = Debug|Win32
-		{F88313A3-8D3A-4146-B38C-84CF62D84F5D}.Release|Win32.ActiveCfg = Release|Win32
-		{F88313A3-8D3A-4146-B38C-84CF62D84F5D}.Release|Win32.Build.0 = Release|Win32
-		{185A2D4E-217E-402A-BECC-497D9FE58411}.Debug|Win32.ActiveCfg = Debug|Win32
-		{185A2D4E-217E-402A-BECC-497D9FE58411}.Debug|Win32.Build.0 = Debug|Win32
-		{185A2D4E-217E-402A-BECC-497D9FE58411}.Release|Win32.ActiveCfg = Release|Win32
-		{185A2D4E-217E-402A-BECC-497D9FE58411}.Release|Win32.Build.0 = Release|Win32		
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Debug|Win32.Build.0 = Debug|Win32
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Release|Win32.ActiveCfg = Release|Win32
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Release|Win32.Build.0 = Release|Win32
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Debug|x64.ActiveCfg = Debug|x64
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Debug|x64.Build.0 = Debug|x64
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Release|x64.ActiveCfg = Release|x64
+		{CA26465D-2CAE-4E23-87E0-E1A1B7B1813E}.Release|x64.Build.0 = Release|x64
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Debug|Win32.Build.0 = Debug|Win32
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Release|Win32.ActiveCfg = Release|Win32
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Release|Win32.Build.0 = Release|Win32
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Debug|x64.ActiveCfg = Debug|x64
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Debug|x64.Build.0 = Debug|x64
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Release|x64.ActiveCfg = Release|x64
+		{0DC939A3-4A5E-4A8C-AC3A-B3EE5B213831}.Release|x64.Build.0 = Release|x64
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Debug|Win32.Build.0 = Debug|Win32
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Release|Win32.ActiveCfg = Release|Win32
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Release|Win32.Build.0 = Release|Win32
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Debug|x64.ActiveCfg = Debug|x64
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Debug|x64.Build.0 = Debug|x64
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Release|x64.ActiveCfg = Release|x64
+		{FCEF3FAC-A77D-4AD9-88B7-D0ED12243F90}.Release|x64.Build.0 = Release|x64
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Debug|Win32.Build.0 = Debug|Win32
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Release|Win32.ActiveCfg = Release|Win32
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Release|Win32.Build.0 = Release|Win32
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Debug|x64.ActiveCfg = Debug|x64
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Debug|x64.Build.0 = Debug|x64
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Release|x64.ActiveCfg = Release|x64
+		{B47BB568-D15B-46E6-9175-9980CEEAAC5A}.Release|x64.Build.0 = Release|x64
+		{C033CED3-A290-4826-841E-A045E30993F7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C033CED3-A290-4826-841E-A045E30993F7}.Debug|Win32.Build.0 = Debug|Win32
+		{C033CED3-A290-4826-841E-A045E30993F7}.Release|Win32.ActiveCfg = Release|Win32
+		{C033CED3-A290-4826-841E-A045E30993F7}.Release|Win32.Build.0 = Release|Win32
+		{C033CED3-A290-4826-841E-A045E30993F7}.Debug|x64.ActiveCfg = Debug|x64
+		{C033CED3-A290-4826-841E-A045E30993F7}.Debug|x64.Build.0 = Debug|x64
+		{C033CED3-A290-4826-841E-A045E30993F7}.Release|x64.ActiveCfg = Release|x64
+		{C033CED3-A290-4826-841E-A045E30993F7}.Release|x64.Build.0 = Release|x64
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Debug|Win32.Build.0 = Debug|Win32
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Release|Win32.ActiveCfg = Release|Win32
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Release|Win32.Build.0 = Release|Win32
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Debug|x64.ActiveCfg = Debug|x64
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Debug|x64.Build.0 = Debug|x64
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Release|x64.ActiveCfg = Release|x64
+		{44FED3E4-D0F0-4CE9-8E6C-C980B9539DBC}.Release|x64.Build.0 = Release|x64
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Debug|Win32.ActiveCfg = Debug|Win32
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Debug|Win32.Build.0 = Debug|Win32
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Release|Win32.ActiveCfg = Release|Win32
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Release|Win32.Build.0 = Release|Win32
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Debug|x64.ActiveCfg = Debug|x64
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Debug|x64.Build.0 = Debug|x64
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Release|x64.ActiveCfg = Release|x64
+		{591705A4-7876-436E-9EFB-37CB4FC04144}.Release|x64.Build.0 = Release|x64
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Debug|Win32.Build.0 = Debug|Win32
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Release|Win32.ActiveCfg = Release|Win32
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Release|Win32.Build.0 = Release|Win32
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Debug|x64.ActiveCfg = Debug|x64
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Debug|x64.Build.0 = Debug|x64
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Release|x64.ActiveCfg = Release|x64
+		{A4146E8A-3842-4D48-B52F-928E30AA0768}.Release|x64.Build.0 = Release|x64
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Debug|Win32.Build.0 = Debug|Win32
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Release|Win32.ActiveCfg = Release|Win32
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Release|Win32.Build.0 = Release|Win32
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Debug|x64.ActiveCfg = Debug|x64
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Debug|x64.Build.0 = Debug|x64
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Release|x64.ActiveCfg = Release|x64
+		{32D0DBE6-143D-4CE1-9BB5-279F61426CAA}.Release|x64.Build.0 = Release|x64
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Debug|Win32.Build.0 = Debug|Win32
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Release|Win32.ActiveCfg = Release|Win32
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Release|Win32.Build.0 = Release|Win32
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Debug|x64.ActiveCfg = Debug|x64
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Debug|x64.Build.0 = Debug|x64
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Release|x64.ActiveCfg = Release|x64
+		{862D40C6-8774-42DF-B89D-B35202B97DCB}.Release|x64.Build.0 = Release|x64
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Debug|Win32.Build.0 = Debug|Win32
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Release|Win32.ActiveCfg = Release|Win32
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Release|Win32.Build.0 = Release|Win32
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Debug|x64.ActiveCfg = Debug|x64
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Debug|x64.Build.0 = Debug|x64
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Release|x64.ActiveCfg = Release|x64
+		{50EA5C82-81E7-4AE2-A1AF-60AE6BDED4AD}.Release|x64.Build.0 = Release|x64
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Debug|Win32.Build.0 = Debug|Win32
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Release|Win32.ActiveCfg = Release|Win32
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Release|Win32.Build.0 = Release|Win32
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Debug|x64.ActiveCfg = Debug|x64
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Debug|x64.Build.0 = Debug|x64
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Release|x64.ActiveCfg = Release|x64
+		{AD84FC41-AF41-4E2B-951B-B530442F5A0C}.Release|x64.Build.0 = Release|x64
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Debug|Win32.Build.0 = Debug|Win32
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Release|Win32.ActiveCfg = Release|Win32
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Release|Win32.Build.0 = Release|Win32
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Debug|x64.ActiveCfg = Debug|x64
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Debug|x64.Build.0 = Debug|x64
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Release|x64.ActiveCfg = Release|x64
+		{F4446F2D-F9DD-40AF-91FA-0F621152E2CB}.Release|x64.Build.0 = Release|x64
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Debug|Win32.Build.0 = Debug|Win32
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Release|Win32.ActiveCfg = Release|Win32
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Release|Win32.Build.0 = Release|Win32
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Debug|x64.ActiveCfg = Debug|x64
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Debug|x64.Build.0 = Debug|x64
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Release|x64.ActiveCfg = Release|x64
+		{82596791-5B31-48FF-999D-E6A5F45EE582}.Release|x64.Build.0 = Release|x64
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Debug|Win32.Build.0 = Debug|Win32
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Release|Win32.ActiveCfg = Release|Win32
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Release|Win32.Build.0 = Release|Win32
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Debug|x64.ActiveCfg = Debug|x64
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Debug|x64.Build.0 = Debug|x64
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Release|x64.ActiveCfg = Release|x64
+		{38830DBF-1598-49BA-9BFF-89D3D5C223A5}.Release|x64.Build.0 = Release|x64
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Debug|Win32.ActiveCfg = Debug|Win32
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Debug|Win32.Build.0 = Debug|Win32
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Release|Win32.ActiveCfg = Release|Win32
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Release|Win32.Build.0 = Release|Win32
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Debug|x64.ActiveCfg = Debug|x64
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Debug|x64.Build.0 = Debug|x64
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Release|x64.ActiveCfg = Release|x64
+		{675F59F8-906C-4E52-AAFB-9C5822D1E087}.Release|x64.Build.0 = Release|x64
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Debug|Win32.Build.0 = Debug|Win32
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Release|Win32.ActiveCfg = Release|Win32
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Release|Win32.Build.0 = Release|Win32
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Debug|x64.ActiveCfg = Debug|x64
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Debug|x64.Build.0 = Debug|x64
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Release|x64.ActiveCfg = Release|x64
+		{3F938622-F4F5-4755-A91A-66E5D4ABCDE7}.Release|x64.Build.0 = Release|x64
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Debug|Win32.Build.0 = Debug|Win32
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Release|Win32.ActiveCfg = Release|Win32
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Release|Win32.Build.0 = Release|Win32
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Debug|x64.ActiveCfg = Debug|x64
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Debug|x64.Build.0 = Debug|x64
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Release|x64.ActiveCfg = Release|x64
+		{D222F352-BF3B-4F41-A403-9D8AFCA75266}.Release|x64.Build.0 = Release|x64
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Debug|Win32.Build.0 = Debug|Win32
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Release|Win32.ActiveCfg = Release|Win32
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Release|Win32.Build.0 = Release|Win32
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Debug|x64.ActiveCfg = Debug|x64
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Debug|x64.Build.0 = Debug|x64
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Release|x64.ActiveCfg = Release|x64
+		{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}.Release|x64.Build.0 = Release|x64
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Debug|Win32.ActiveCfg = Debug|Win32
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Debug|Win32.Build.0 = Debug|Win32
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Release|Win32.ActiveCfg = Release|Win32
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Release|Win32.Build.0 = Release|Win32
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Debug|x64.ActiveCfg = Debug|x64
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Debug|x64.Build.0 = Debug|x64
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Release|x64.ActiveCfg = Release|x64
+		{16055389-BE24-4217-899B-5E1E272B4A37}.Release|x64.Build.0 = Release|x64
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Debug|Win32.Build.0 = Debug|Win32
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Release|Win32.ActiveCfg = Release|Win32
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Release|Win32.Build.0 = Release|Win32
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Debug|x64.ActiveCfg = Debug|x64
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Debug|x64.Build.0 = Debug|x64
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Release|x64.ActiveCfg = Release|x64
+		{617CC004-E2AD-4F38-A18F-5547A2FD667D}.Release|x64.Build.0 = Release|x64
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Debug|Win32.Build.0 = Debug|Win32
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Release|Win32.ActiveCfg = Release|Win32
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Release|Win32.Build.0 = Release|Win32
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Debug|x64.ActiveCfg = Debug|x64
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Debug|x64.Build.0 = Debug|x64
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Release|x64.ActiveCfg = Release|x64
+		{6001C2EE-FCBB-461B-A897-EF41384D46BF}.Release|x64.Build.0 = Release|x64
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Debug|Win32.Build.0 = Debug|Win32
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Release|Win32.ActiveCfg = Release|Win32
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Release|Win32.Build.0 = Release|Win32
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Debug|x64.ActiveCfg = Debug|x64
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Debug|x64.Build.0 = Debug|x64
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Release|x64.ActiveCfg = Release|x64
+		{D0F620CC-2420-4827-A883-7BD6E140FC04}.Release|x64.Build.0 = Release|x64
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Debug|Win32.ActiveCfg = Debug|Win32
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Debug|Win32.Build.0 = Debug|Win32
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Release|Win32.ActiveCfg = Release|Win32
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Release|Win32.Build.0 = Release|Win32
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Debug|x64.ActiveCfg = Debug|x64
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Debug|x64.Build.0 = Debug|x64
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Release|x64.ActiveCfg = Release|x64
+		{914AE00F-53BD-42B3-8C04-A88267553C80}.Release|x64.Build.0 = Release|x64
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Debug|Win32.ActiveCfg = Debug|Win32
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Debug|Win32.Build.0 = Debug|Win32
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Release|Win32.ActiveCfg = Release|Win32
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Release|Win32.Build.0 = Release|Win32
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Debug|x64.ActiveCfg = Debug|x64
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Debug|x64.Build.0 = Debug|x64
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Release|x64.ActiveCfg = Release|x64
+		{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}.Release|x64.Build.0 = Release|x64
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Debug|Win32.Build.0 = Debug|Win32
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Release|Win32.ActiveCfg = Release|Win32
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Release|Win32.Build.0 = Release|Win32
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Debug|x64.ActiveCfg = Debug|x64
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Debug|x64.Build.0 = Debug|x64
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Release|x64.ActiveCfg = Release|x64
+		{A5FFC619-C5A3-4086-B396-1337DDC0B167}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index e0dd6cc9a7..a04ef87732 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -3,39 +3,230 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="scummvm"
-	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
+	ProjectGUID="{EEEB795E-F3B3-43C9-9942-3DCCBF73AD7D}"
 	RootNamespace="scummvm"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib winmm.lib sdl.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release.vsprops">
-			<Tool Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib $(OutDir)/*.lib"
+			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib winmm.lib sdl.lib"
+			/>
+		</Configuration>
+		<Configuration Name="Debug|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug64.vsprops">
+			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib winmm.lib sdl.lib"
+			/>
+		</Configuration>
+		<Configuration Name="Release|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release64.vsprops">
+			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm.exe"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib winmm.lib sdl.lib"
 			/>
 		</Configuration>
 	</Configurations>
 	<Files>
+		<Filter	Name="backends">
+			<Filter	Name="events">
+				<Filter	Name="default">
+					<File RelativePath="..\..\backends\events\default\default-events.cpp" />
+					<File RelativePath="..\..\backends\events\default\default-events.h" />
+				</Filter>
+			</Filter>
+			<Filter	Name="fs">
+				<Filter	Name="amigaos4">
+					<File RelativePath="..\..\backends\fs\amigaos4\amigaos4-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\amigaos4\amigaos4-fs-factory.h" />
+				</Filter>
+				<Filter	Name="ds">
+					<File RelativePath="..\..\backends\fs\ds\ds-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\ds\ds-fs-factory.h" />
+					<File RelativePath="..\..\backends\fs\ds\ds-fs.h" />
+				</Filter>
+				<Filter	Name="palmos">
+					<File RelativePath="..\..\backends\fs\palmos\palmos-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\palmos\palmos-fs-factory.h" />
+				</Filter>
+				<Filter	Name="posix">
+					<File RelativePath="..\..\backends\fs\posix\posix-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\posix\posix-fs-factory.h" />
+					<File RelativePath="..\..\backends\fs\posix\posix-fs.h" />
+				</Filter>
+				<Filter	Name="ps2">
+					<File RelativePath="..\..\backends\fs\ps2\ps2-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\ps2\ps2-fs-factory.h" />
+				</Filter>
+				<Filter	Name="psp">
+					<File RelativePath="..\..\backends\fs\psp\psp-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\psp\psp-fs-factory.h" />
+					<File RelativePath="..\..\backends\fs\psp\psp-stream.cpp" />
+					<File RelativePath="..\..\backends\fs\psp\psp-stream.h" />
+				</Filter>
+				<Filter	Name="symbian">
+					<File RelativePath="..\..\backends\fs\symbian\symbian-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\symbian\symbian-fs-factory.h" />
+					<File RelativePath="..\..\backends\fs\symbian\symbianstream.h" />
+				</Filter>
+				<Filter	Name="wii">
+					<File RelativePath="..\..\backends\fs\wii\wii-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\wii\wii-fs-factory.h" />
+				</Filter>
+				<Filter	Name="windows">
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp" />
+					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.h" />
+				</Filter>
+				<File RelativePath="..\..\backends\fs\abstract-fs.cpp" />
+				<File RelativePath="..\..\backends\fs\abstract-fs.h" />
+				<File RelativePath="..\..\backends\fs\fs-factory.h" />
+				<File RelativePath="..\..\backends\fs\stdiostream.cpp" />
+				<File RelativePath="..\..\backends\fs\stdiostream.h" />
+			</Filter>
+			<Filter	Name="keymapper">
+				<File RelativePath="..\..\backends\keymapper\action.cpp" />
+				<File RelativePath="..\..\backends\keymapper\action.h" />
+				<File RelativePath="..\..\backends\keymapper\hardware-key.h" />
+				<File RelativePath="..\..\backends\keymapper\keymap.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymap.h" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.cpp" />
+				<File RelativePath="..\..\backends\keymapper\keymapper.h" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.cpp" />
+				<File RelativePath="..\..\backends\keymapper\remap-dialog.h" />
+				<File RelativePath="..\..\backends\keymapper\types.h" />
+			</Filter>
+			<Filter	Name="midi">
+				<File RelativePath="..\..\backends\midi\alsa.cpp" />
+				<File RelativePath="..\..\backends\midi\camd.cpp" />
+				<File RelativePath="..\..\backends\midi\coreaudio.cpp" />
+				<File RelativePath="..\..\backends\midi\coremidi.cpp" />
+				<File RelativePath="..\..\backends\midi\dmedia.cpp" />
+				<File RelativePath="..\..\backends\midi\seq.cpp" />
+				<File RelativePath="..\..\backends\midi\stmidi.cpp" />
+				<File RelativePath="..\..\backends\midi\timidity.cpp" />
+				<File RelativePath="..\..\backends\midi\windows.cpp" />
+			</Filter>
+			<Filter	Name="platform">
+				<Filter	Name="sdl">
+					<File RelativePath="..\..\backends\platform\sdl\events.cpp" />
+					<File RelativePath="..\..\backends\platform\sdl\graphics.cpp" />
+					<File RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp" />
+					<File RelativePath="..\..\backends\platform\sdl\main.cpp">
+						<FileConfiguration Name="Debug|Win32">
+							<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\backends_platform_sdl_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\backends_platform_sdl_$(InputName).xdc" />
+						</FileConfiguration>
+						<FileConfiguration Name="Release|Win32">
+							<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\backends_platform_sdl_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\backends_platform_sdl_$(InputName).xdc" />
+						</FileConfiguration>
+						<FileConfiguration Name="Debug|x64">
+							<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\backends_platform_sdl_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\backends_platform_sdl_$(InputName).xdc" />
+						</FileConfiguration>
+						<FileConfiguration Name="Release|x64">
+							<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\backends_platform_sdl_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\backends_platform_sdl_$(InputName).xdc" />
+						</FileConfiguration>
+					</File>
+					<File RelativePath="..\..\backends\platform\sdl\module.mk" />
+					<File RelativePath="..\..\backends\platform\sdl\sdl.cpp" />
+					<File RelativePath="..\..\backends\platform\sdl\sdl.h" />
+				</Filter>
+			</Filter>
+			<Filter	Name="plugins">
+				<Filter	Name="dc">
+					<File RelativePath="..\..\backends\plugins\dc\dc-provider.cpp" />
+					<File RelativePath="..\..\backends\plugins\dc\dc-provider.h" />
+				</Filter>
+				<Filter	Name="posix">
+					<File RelativePath="..\..\backends\plugins\posix\posix-provider.cpp" />
+					<File RelativePath="..\..\backends\plugins\posix\posix-provider.h" />
+				</Filter>
+				<Filter	Name="psp">
+					<File RelativePath="..\..\backends\plugins\psp\psp-provider.cpp" />
+					<File RelativePath="..\..\backends\plugins\psp\psp-provider.h" />
+				</Filter>
+				<Filter	Name="sdl">
+					<File RelativePath="..\..\backends\plugins\sdl\sdl-provider.cpp" />
+					<File RelativePath="..\..\backends\plugins\sdl\sdl-provider.h" />
+				</Filter>
+				<Filter	Name="win32">
+					<File RelativePath="..\..\backends\plugins\win32\win32-provider.cpp" />
+					<File RelativePath="..\..\backends\plugins\win32\win32-provider.h" />
+				</Filter>
+				<File RelativePath="..\..\backends\plugins\dynamic-plugin.h" />
+			</Filter>
+			<Filter	Name="saves">
+				<Filter	Name="default">
+					<File RelativePath="..\..\backends\saves\default\default-saves.cpp" />
+					<File RelativePath="..\..\backends\saves\default\default-saves.h" />
+				</Filter>
+				<Filter	Name="posix">
+					<File RelativePath="..\..\backends\saves\posix\posix-saves.cpp" />
+					<File RelativePath="..\..\backends\saves\posix\posix-saves.h" />
+				</Filter>
+				<Filter	Name="psp">
+					<File RelativePath="..\..\backends\saves\psp\psp-saves.cpp" />
+					<File RelativePath="..\..\backends\saves\psp\psp-saves.h" />
+				</Filter>
+				<File RelativePath="..\..\backends\saves\savefile.cpp" />
+			</Filter>
+			<Filter	Name="timer">
+				<Filter	Name="default">
+					<File RelativePath="..\..\backends\timer\default\default-timer.cpp" />
+					<File RelativePath="..\..\backends\timer\default\default-timer.h" />
+				</Filter>
+			</Filter>
+			<Filter	Name="vkeybd">
+				<File RelativePath="..\..\backends\vkeybd\image-map.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\image-map.h" />
+				<File RelativePath="..\..\backends\vkeybd\keycode-descriptions.h" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\polygon.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp" />
+				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.h" />
+			</Filter>
+			<File RelativePath="..\..\backends\base-backend.cpp" />
+			<File RelativePath="..\..\backends\base-backend.h" />
+			<File RelativePath="..\..\backends\module.mk" />
+		</Filter>
 		<Filter	Name="base">
 			<File RelativePath="..\..\base\commandLine.cpp" />
 			<File RelativePath="..\..\base\commandLine.h" />
 			<File RelativePath="..\..\base\internal_version.h" />
-			<File RelativePath="..\..\base\main.cpp" />
+			<File RelativePath="..\..\base\main.cpp">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\base_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\base_$(InputName).xdc" />
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\base_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\base_$(InputName).xdc" />
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\base_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\base_$(InputName).xdc" />
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCLCompilerTool" ObjectFile="$(IntDir)\base_$(InputName).obj" XMLDocumentationFileName="$(IntDir)\base_$(InputName).xdc" />
+				</FileConfiguration>
+			</File>
 			<File RelativePath="..\..\base\main.h" />
+			<File RelativePath="..\..\base\module.mk" />
 			<File RelativePath="..\..\base\plugins.cpp" />
 			<File RelativePath="..\..\base\plugins.h" />
 			<File RelativePath="..\..\base\version.cpp" />
 			<File RelativePath="..\..\base\version.h" />
 		</Filter>
 		<Filter	Name="common">
+			<File RelativePath="..\..\common\EventDispatcher.cpp" />
+			<File RelativePath="..\..\common\EventRecorder.cpp" />
+			<File RelativePath="..\..\common\EventRecorder.h" />
 			<File RelativePath="..\..\common\algorithm.h" />
 			<File RelativePath="..\..\common\archive.cpp" />
 			<File RelativePath="..\..\common\archive.h" />
@@ -48,9 +239,6 @@
 			<File RelativePath="..\..\common\debug.h" />
 			<File RelativePath="..\..\common\endian.h" />
 			<File RelativePath="..\..\common\error.h" />
-			<File RelativePath="..\..\common\EventDispatcher.cpp" />
-			<File RelativePath="..\..\common\EventRecorder.cpp" />
-			<File RelativePath="..\..\common\EventRecorder.h" />
 			<File RelativePath="..\..\common\events.h" />
 			<File RelativePath="..\..\common\file.cpp" />
 			<File RelativePath="..\..\common\file.h" />
@@ -69,6 +257,7 @@
 			<File RelativePath="..\..\common\md5.h" />
 			<File RelativePath="..\..\common\memorypool.cpp" />
 			<File RelativePath="..\..\common\memorypool.h" />
+			<File RelativePath="..\..\common\module.mk" />
 			<File RelativePath="..\..\common\mutex.cpp" />
 			<File RelativePath="..\..\common\mutex.h" />
 			<File RelativePath="..\..\common\noncopyable.h" />
@@ -100,206 +289,143 @@
 			<File RelativePath="..\..\common\zlib.cpp" />
 			<File RelativePath="..\..\common\zlib.h" />
 		</Filter>
-		<Filter	Name="sound">
-			<File RelativePath="..\..\sound\adpcm.cpp" />
-			<File RelativePath="..\..\sound\adpcm.h" />
-			<File RelativePath="..\..\sound\aiff.cpp" />
-			<File RelativePath="..\..\sound\aiff.h" />
-			<File RelativePath="..\..\sound\audiocd.cpp" />
-			<File RelativePath="..\..\sound\audiocd.h" />
-			<File RelativePath="..\..\sound\audiostream.cpp" />
-			<File RelativePath="..\..\sound\audiostream.h" />
-			<File RelativePath="..\..\sound\flac.cpp" />
-			<File RelativePath="..\..\sound\flac.h" />
-			<File RelativePath="..\..\sound\fmopl.cpp" />
-			<File RelativePath="..\..\sound\fmopl.h" />
-			<File RelativePath="..\..\sound\iff_sound.cpp" />
-			<File RelativePath="..\..\sound\iff_sound.h" />
-			<File RelativePath="..\..\sound\mididrv.cpp" />
-			<File RelativePath="..\..\sound\mididrv.h" />
-			<File RelativePath="..\..\sound\midiparser.cpp" />
-			<File RelativePath="..\..\sound\midiparser.h" />
-			<File RelativePath="..\..\sound\midiparser_smf.cpp" />
-			<File RelativePath="..\..\sound\midiparser_xmidi.cpp" />
-			<File RelativePath="..\..\sound\mixer.cpp" />
-			<File RelativePath="..\..\sound\mixer.h" />
-			<File RelativePath="..\..\sound\mixer_intern.h" />
-			<File RelativePath="..\..\sound\mp3.cpp" />
-			<File RelativePath="..\..\sound\mp3.h" />
-			<File RelativePath="..\..\sound\mpu401.cpp" />
-			<File RelativePath="..\..\sound\mpu401.h" />
-			<File RelativePath="..\..\sound\musicplugin.cpp" />
-			<File RelativePath="..\..\sound\musicplugin.h" />
-			<File RelativePath="..\..\sound\null.cpp" />
-			<File RelativePath="..\..\sound\rate.cpp" />
-			<File RelativePath="..\..\sound\rate.h" />
-			<File RelativePath="..\..\sound\shorten.cpp" />
-			<File RelativePath="..\..\sound\shorten.h" />
-			<File RelativePath="..\..\sound\timestamp.cpp" />
-			<File RelativePath="..\..\sound\timestamp.h" />
-			<File RelativePath="..\..\sound\vag.cpp" />
-			<File RelativePath="..\..\sound\vag.h" />
-			<File RelativePath="..\..\sound\voc.cpp" />
-			<File RelativePath="..\..\sound\voc.h" />
-			<File RelativePath="..\..\sound\vorbis.cpp" />
-			<File RelativePath="..\..\sound\vorbis.h" />
-			<File RelativePath="..\..\sound\wave.cpp" />
-			<File RelativePath="..\..\sound\wave.h" />
-			<Filter Name="softhsynth">
-				<File	RelativePath="..\..\sound\softsynth\adlib.cpp" />
-				<File RelativePath="..\..\sound\softsynth\emumidi.h" />
-				<File RelativePath="..\..\sound\softsynth\fluidsynth.cpp" />
-				<File RelativePath="..\..\sound\softsynth\mt32.cpp" />
-				<File RelativePath="..\..\sound\softsynth\pcspk.cpp" />
-				<File RelativePath="..\..\sound\softsynth\pcspk.h" />
-				<File RelativePath="..\..\sound\softsynth\ym2612.cpp" />
-				<File RelativePath="..\..\sound\softsynth\ym2612.h" />
-				<Filter	Name="mt32">
-					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\i386.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\i386.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\part.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\part.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\partial.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\partial.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\structures.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\synth.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\synth.h" />
-					<File RelativePath="..\..\sound\softsynth\mt32\tables.cpp" />
-					<File RelativePath="..\..\sound\softsynth\mt32\tables.h" />
-				</Filter>
-				<Filter Name="opl">
-					<File RelativePath="..\..\sound\softsynth\opl\dosbox.cpp" />
-					<File RelativePath="..\..\sound\softsynth\opl\dosbox.h" />
-					<File RelativePath="..\..\sound\softsynth\opl\mame.cpp" />
-					<File RelativePath="..\..\sound\softsynth\opl\mame.h" />
-					<File RelativePath="..\..\sound\softsynth\opl\opl_impl.h" />
-					<File RelativePath="..\..\sound\softsynth\opl\opl_inc.h" />
-				</Filter>
-			</Filter>
-			<Filter Name="mods">
-				<File RelativePath="..\..\sound\mods\infogrames.cpp" />
-				<File RelativePath="..\..\sound\mods\infogrames.h" />
-				<File RelativePath="..\..\sound\mods\maxtrax.cpp" />
-				<File RelativePath="..\..\sound\mods\maxtrax.h" />
-				<File RelativePath="..\..\sound\mods\module.cpp" />
-				<File RelativePath="..\..\sound\mods\module.h" />
-				<File RelativePath="..\..\sound\mods\paula.cpp" />
-				<File RelativePath="..\..\sound\mods\paula.h" />
-				<File RelativePath="..\..\sound\mods\protracker.cpp" />
-				<File RelativePath="..\..\sound\mods\protracker.h" />
-				<File RelativePath="..\..\sound\mods\rjp1.cpp" />
-				<File RelativePath="..\..\sound\mods\rjp1.h" />
-				<File RelativePath="..\..\sound\mods\soundfx.cpp" />
-				<File RelativePath="..\..\sound\mods\soundfx.h" />
-				<File RelativePath="..\..\sound\mods\tfmx.cpp" />
-				<File RelativePath="..\..\sound\mods\tfmx.h" />
-			</Filter>
-		</Filter>
-		<Filter Name="txt">
-			<File RelativePath="..\..\COPYING" />
-			<File RelativePath="..\..\NEWS" />
-			<File RelativePath="..\..\README" />
-			<File RelativePath="..\..\TODO" />
-		</Filter>
-		<Filter Name="rsc">
-			<File RelativePath="..\..\icons\scummvm.ico" />
+		<Filter	Name="dists">
 			<File RelativePath="..\..\dists\scummvm.rc" />
 		</Filter>
-		<Filter Name="backends">
-			<File RelativePath="..\..\backends\base-backend.cpp" />
-			<File RelativePath="..\..\backends\base-backend.h" />
-			<Filter Name="sdl">
-				<File RelativePath="..\..\backends\platform\sdl\events.cpp" />
-				<File RelativePath="..\..\backends\platform\sdl\graphics.cpp" />
-				<File RelativePath="..\..\backends\platform\sdl\hardwarekeys.cpp" />
-				<File
-					RelativePath="..\..\backends\platform\sdl\main.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
+		<Filter	Name="engines">
+			<File RelativePath="..\..\engines\advancedDetector.cpp" />
+			<File RelativePath="..\..\engines\advancedDetector.h" />
+			<File RelativePath="..\..\engines\dialogs.cpp" />
+			<File RelativePath="..\..\engines\dialogs.h" />
+			<File RelativePath="..\..\engines\engine.cpp" />
+			<File RelativePath="..\..\engines\engine.h" />
+			<File RelativePath="..\..\engines\game.cpp" />
+			<File RelativePath="..\..\engines\game.h" />
+			<File RelativePath="..\..\engines\metaengine.h" />
+			<File RelativePath="..\..\engines\module.mk" />
+		</Filter>
+		<Filter	Name="graphics">
+			<Filter	Name="fonts">
+				<File RelativePath="..\..\graphics\fonts\consolefont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont.cpp" />
+				<File RelativePath="..\..\graphics\fonts\newfont_big.cpp" />
+				<File RelativePath="..\..\graphics\fonts\scummfont.cpp" />
+			</Filter>
+			<Filter	Name="scaler">
+				<File RelativePath="..\..\graphics\scaler\2xsai.cpp" />
+				<File RelativePath="..\..\graphics\scaler\aspect.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq2x.h" />
+				<File RelativePath="..\..\graphics\scaler\hq2x_i386.asm">
+					<FileConfiguration Name="Debug|Win32">
+						<Tool Name="VCCustomBuildTool" CommandLine="nasm.exe -f win32 -g -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" Outputs="$(IntDir)\$(InputName).obj" />
+					</FileConfiguration>
+					<FileConfiguration Name="Release|Win32">
+						<Tool Name="VCCustomBuildTool" CommandLine="nasm.exe -f win32 -g -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" Outputs="$(IntDir)\$(InputName).obj" />
+					</FileConfiguration>
+				</File>
+				<File RelativePath="..\..\graphics\scaler\hq3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\hq3x.h" />
+				<File RelativePath="..\..\graphics\scaler\hq3x_i386.asm">
+					<FileConfiguration Name="Debug|Win32">
+						<Tool Name="VCCustomBuildTool" CommandLine="nasm.exe -f win32 -g -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" Outputs="$(IntDir)\$(InputName).obj" />
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
+					<FileConfiguration Name="Release|Win32">
+						<Tool Name="VCCustomBuildTool" CommandLine="nasm.exe -f win32 -g -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;" Outputs="$(IntDir)\$(InputName).obj" />
 					</FileConfiguration>
 				</File>
-				<File RelativePath="..\..\backends\platform\sdl\sdl.cpp" />
-				<File RelativePath="..\..\backends\platform\sdl\sdl.h" />
+				<File RelativePath="..\..\graphics\scaler\intern.h" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale2x.h" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scale3x.h" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.cpp" />
+				<File RelativePath="..\..\graphics\scaler\scalebit.h" />
+				<File RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp" />
 			</Filter>
-			<Filter Name="fs">
-				<File RelativePath="..\..\backends\fs\abstract-fs.cpp" />
-				<File RelativePath="..\..\backends\fs\abstract-fs.h" />
-				<File RelativePath="..\..\backends\fs\fs-factory.h" />
-				<File RelativePath="..\..\backends\fs\stdiostream.cpp" />
-				<File RelativePath="..\..\backends\fs\stdiostream.h" />
-				<Filter Name="windows">
-					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.cpp" />
-					<File RelativePath="..\..\backends\fs\windows\windows-fs-factory.h" />
+			<Filter	Name="video">
+				<Filter	Name="codecs">
+					<File RelativePath="..\..\graphics\video\codecs\codec.h" />
+					<File RelativePath="..\..\graphics\video\codecs\msvideo1.cpp" />
+					<File RelativePath="..\..\graphics\video\codecs\msvideo1.h" />
 				</Filter>
-			</Filter>
-			<Filter Name="midi">
-				<File RelativePath="..\..\backends\midi\windows.cpp" />
-			</Filter>
-			<Filter Name="timer">
-				<File RelativePath="..\..\backends\timer\default\default-timer.cpp" />
-				<File RelativePath="..\..\backends\timer\default\default-timer.h" />
-			</Filter>
-			<Filter Name="saves">
-				<File RelativePath="..\..\backends\saves\default\default-saves.cpp" />
-				<File RelativePath="..\..\backends\saves\default\default-saves.h" />
-				<File RelativePath="..\..\backends\saves\savefile.cpp" />
-			</Filter>
-			<Filter Name="events">
-				<Filter Name="default">
-					<File RelativePath="..\..\backends\events\default\default-events.cpp" />
-					<File RelativePath="..\..\backends\events\default\default-events.h" />
+				<Filter	Name="coktelvideo">
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp" />
+					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.h" />
 				</Filter>
+				<File RelativePath="..\..\graphics\video\avi_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\avi_decoder.h" />
+				<File RelativePath="..\..\graphics\video\dxa_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\dxa_decoder.h" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\flic_decoder.h" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.cpp" />
+				<File RelativePath="..\..\graphics\video\mpeg_player.h" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.cpp" />
+				<File RelativePath="..\..\graphics\video\smk_decoder.h" />
+				<File RelativePath="..\..\graphics\video\video_player.cpp" />
+				<File RelativePath="..\..\graphics\video\video_player.h" />
 			</Filter>
-			<Filter Name="keymapper">
-				<File RelativePath="..\..\backends\keymapper\action.cpp" />
-				<File RelativePath="..\..\backends\keymapper\action.h" />
-				<File RelativePath="..\..\backends\keymapper\hardware-key.h" />
-				<File RelativePath="..\..\backends\keymapper\keymap.cpp" />
-				<File RelativePath="..\..\backends\keymapper\keymap.h" />
-				<File RelativePath="..\..\backends\keymapper\keymapper.cpp" />
-				<File RelativePath="..\..\backends\keymapper\keymapper.h" />
-				<File RelativePath="..\..\backends\keymapper\remap-dialog.cpp" />
-				<File RelativePath="..\..\backends\keymapper\remap-dialog.h" />
-				<File RelativePath="..\..\backends\keymapper\types.h" />
-			</Filter>
-			<Filter Name="vkeybd">
-				<File RelativePath="..\..\backends\vkeybd\image-map.cpp" />
-				<File RelativePath="..\..\backends\vkeybd\image-map.h" />
-				<File RelativePath="..\..\backends\vkeybd\keycode-descriptions.h" />
-				<File RelativePath="..\..\backends\vkeybd\polygon.cpp" />
-				<File RelativePath="..\..\backends\vkeybd\polygon.h" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp" />
-				<File RelativePath="..\..\backends\vkeybd\virtual-keyboard.h" />
-			</Filter>
+			<File RelativePath="..\..\graphics\VectorRenderer.cpp" />
+			<File RelativePath="..\..\graphics\VectorRenderer.h" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.cpp" />
+			<File RelativePath="..\..\graphics\VectorRendererSpec.h" />
+			<File RelativePath="..\..\graphics\colormasks.h" />
+			<File RelativePath="..\..\graphics\conversion.cpp" />
+			<File RelativePath="..\..\graphics\conversion.h" />
+			<File RelativePath="..\..\graphics\cursorman.cpp" />
+			<File RelativePath="..\..\graphics\cursorman.h" />
+			<File RelativePath="..\..\graphics\dither.cpp" />
+			<File RelativePath="..\..\graphics\dither.h" />
+			<File RelativePath="..\..\graphics\font.cpp" />
+			<File RelativePath="..\..\graphics\font.h" />
+			<File RelativePath="..\..\graphics\fontman.cpp" />
+			<File RelativePath="..\..\graphics\fontman.h" />
+			<File RelativePath="..\..\graphics\iff.cpp" />
+			<File RelativePath="..\..\graphics\iff.h" />
+			<File RelativePath="..\..\graphics\imagedec.cpp" />
+			<File RelativePath="..\..\graphics\imagedec.h" />
+			<File RelativePath="..\..\graphics\jpeg.cpp" />
+			<File RelativePath="..\..\graphics\jpeg.h" />
+			<File RelativePath="..\..\graphics\module.mk" />
+			<File RelativePath="..\..\graphics\pixelformat.h" />
+			<File RelativePath="..\..\graphics\primitives.cpp" />
+			<File RelativePath="..\..\graphics\primitives.h" />
+			<File RelativePath="..\..\graphics\scaler.cpp" />
+			<File RelativePath="..\..\graphics\scaler.h" />
+			<File RelativePath="..\..\graphics\sjis.cpp" />
+			<File RelativePath="..\..\graphics\sjis.h" />
+			<File RelativePath="..\..\graphics\surface.cpp" />
+			<File RelativePath="..\..\graphics\surface.h" />
+			<File RelativePath="..\..\graphics\thumbnail.cpp" />
+			<File RelativePath="..\..\graphics\thumbnail.h" />
 		</Filter>
-		<Filter Name="gui">
+		<Filter	Name="gui">
+			<File RelativePath="..\..\gui\Actions.h" />
+			<File RelativePath="..\..\gui\EditTextWidget.cpp" />
+			<File RelativePath="..\..\gui\EditTextWidget.h" />
+			<File RelativePath="..\..\gui\GuiManager.cpp" />
+			<File RelativePath="..\..\gui\GuiManager.h" />
+			<File RelativePath="..\..\gui\Key.h" />
+			<File RelativePath="..\..\gui\KeysDialog.h" />
+			<File RelativePath="..\..\gui\ListWidget.cpp" />
+			<File RelativePath="..\..\gui\ListWidget.h" />
+			<File RelativePath="..\..\gui\PopUpWidget.cpp" />
+			<File RelativePath="..\..\gui\PopUpWidget.h" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.cpp" />
+			<File RelativePath="..\..\gui\ScrollBarWidget.h" />
+			<File RelativePath="..\..\gui\TabWidget.cpp" />
+			<File RelativePath="..\..\gui\TabWidget.h" />
+			<File RelativePath="..\..\gui\ThemeEngine.cpp" />
+			<File RelativePath="..\..\gui\ThemeEngine.h" />
+			<File RelativePath="..\..\gui\ThemeEval.cpp" />
+			<File RelativePath="..\..\gui\ThemeEval.h" />
+			<File RelativePath="..\..\gui\ThemeLayout.cpp" />
+			<File RelativePath="..\..\gui\ThemeLayout.h" />
+			<File RelativePath="..\..\gui\ThemeParser.cpp" />
+			<File RelativePath="..\..\gui\ThemeParser.h" />
 			<File RelativePath="..\..\gui\about.cpp" />
 			<File RelativePath="..\..\gui\about.h" />
 			<File RelativePath="..\..\gui\browser.cpp" />
@@ -315,180 +441,137 @@
 			<File RelativePath="..\..\gui\dialog.h" />
 			<File RelativePath="..\..\gui\editable.cpp" />
 			<File RelativePath="..\..\gui\editable.h" />
-			<File RelativePath="..\..\gui\EditTextWidget.cpp" />
-			<File RelativePath="..\..\gui\EditTextWidget.h" />
-			<File RelativePath="..\..\gui\GuiManager.cpp" />
-			<File RelativePath="..\..\gui\GuiManager.h" />
-			<File RelativePath="..\..\gui\Key.cpp" />
-			<File RelativePath="..\..\gui\Key.h" />
 			<File RelativePath="..\..\gui\launcher.cpp" />
 			<File RelativePath="..\..\gui\launcher.h" />
-			<File RelativePath="..\..\gui\ListWidget.cpp" />
-			<File RelativePath="..\..\gui\ListWidget.h" />
 			<File RelativePath="..\..\gui\massadd.cpp" />
 			<File RelativePath="..\..\gui\massadd.h" />
 			<File RelativePath="..\..\gui\message.cpp" />
 			<File RelativePath="..\..\gui\message.h" />
+			<File RelativePath="..\..\gui\module.mk" />
 			<File RelativePath="..\..\gui\object.cpp" />
 			<File RelativePath="..\..\gui\object.h" />
 			<File RelativePath="..\..\gui\options.cpp" />
 			<File RelativePath="..\..\gui\options.h" />
-			<File RelativePath="..\..\gui\PopUpWidget.cpp" />
-			<File RelativePath="..\..\gui\PopUpWidget.h" />
 			<File RelativePath="..\..\gui\saveload.cpp" />
 			<File RelativePath="..\..\gui\saveload.h" />
-			<File RelativePath="..\..\gui\ScrollBarWidget.cpp" />
-			<File RelativePath="..\..\gui\ScrollBarWidget.h" />
-			<File RelativePath="..\..\gui\TabWidget.cpp" />
-			<File RelativePath="..\..\gui\TabWidget.h" />
 			<File RelativePath="..\..\gui\themebrowser.cpp" />
 			<File RelativePath="..\..\gui\themebrowser.h" />
-			<File RelativePath="..\..\gui\ThemeEngine.cpp" />
-			<File RelativePath="..\..\gui\ThemeEngine.h" />
-			<File RelativePath="..\..\gui\ThemeEval.cpp" />
-			<File RelativePath="..\..\gui\ThemeLayout.cpp" />
-			<File RelativePath="..\..\gui\ThemeLayout.h" />
-			<File RelativePath="..\..\gui\ThemeParser.cpp" />
-			<File RelativePath="..\..\gui\ThemeParser.h" />
 			<File RelativePath="..\..\gui\widget.cpp" />
 			<File RelativePath="..\..\gui\widget.h" />
 		</Filter>
-		<Filter Name="graphics">
-			<File RelativePath="..\..\graphics\colormasks.h" />
-			<File RelativePath="..\..\graphics\conversion.cpp" />
-			<File RelativePath="..\..\graphics\conversion.h" />
-			<File RelativePath="..\..\graphics\cursorman.cpp" />
-			<File RelativePath="..\..\graphics\cursorman.h" />
-			<File RelativePath="..\..\graphics\dither.cpp" />
-			<File RelativePath="..\..\graphics\dither.h" />
-			<File RelativePath="..\..\graphics\font.cpp" />
-			<File RelativePath="..\..\graphics\font.h" />
-			<File RelativePath="..\..\graphics\fontman.cpp" />
-			<File RelativePath="..\..\graphics\fontman.h" />
-			<File RelativePath="..\..\graphics\iff.cpp" />
-			<File RelativePath="..\..\graphics\iff.h" />
-			<File RelativePath="..\..\graphics\imagedec.cpp" />
-			<File RelativePath="..\..\graphics\imagedec.h" />
-			<File RelativePath="..\..\graphics\jpeg.cpp" />
-			<File RelativePath="..\..\graphics\jpeg.h" />
-			<File RelativePath="..\..\graphics\pixelformat.h" />
-			<File RelativePath="..\..\graphics\primitives.cpp" />
-			<File RelativePath="..\..\graphics\primitives.h" />
-			<File RelativePath="..\..\graphics\scaler.cpp" />
-			<File RelativePath="..\..\graphics\scaler.h" />
-			<File RelativePath="..\..\graphics\sjis.cpp" />
-			<File RelativePath="..\..\graphics\sjis.h" />
-			<File RelativePath="..\..\graphics\surface.cpp" />
-			<File RelativePath="..\..\graphics\surface.h" />
-			<File RelativePath="..\..\graphics\thumbnail.cpp" />
-			<File RelativePath="..\..\graphics\thumbnail.h" />
-			<File RelativePath="..\..\graphics\VectorRenderer.cpp" />
-			<File RelativePath="..\..\graphics\VectorRenderer.h" />
-			<File RelativePath="..\..\graphics\VectorRendererSpec.cpp" />
-			<File RelativePath="..\..\graphics\VectorRendererSpec.h" />
-			<Filter Name="scaler">
-				<File RelativePath="..\..\graphics\scaler\2xsai.cpp" />
-				<File RelativePath="..\..\graphics\scaler\aspect.cpp" />
-				<File RelativePath="..\..\graphics\scaler\hq2x.cpp" />
-				<File RelativePath="..\..\graphics\scaler\hq2x.h" />
-				<File
-					RelativePath="..\..\graphics\scaler\hq2x_i386.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe  -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-				</File>
-				<File RelativePath="..\..\graphics\scaler\hq3x.cpp" />
-				<File RelativePath="..\..\graphics\scaler\hq3x.h" />
-				<File
-					RelativePath="..\..\graphics\scaler\hq3x_i386.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -g -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -f win32 -o &quot;$(OutDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-				</File>
-				<File RelativePath="..\..\graphics\scaler\intern.h" />
-				<File RelativePath="..\..\graphics\scaler\scale2x.cpp" />
-				<File RelativePath="..\..\graphics\scaler\scale2x.h" />
-				<File RelativePath="..\..\graphics\scaler\scale3x.cpp" />
-				<File RelativePath="..\..\graphics\scaler\scale3x.h" />
-				<File RelativePath="..\..\graphics\scaler\scalebit.cpp" />
-				<File RelativePath="..\..\graphics\scaler\scalebit.h" />
-				<File RelativePath="..\..\graphics\scaler\thumbnail_intern.cpp" />
-			</Filter>
-			<Filter Name="fonts">
-				<File RelativePath="..\..\graphics\fonts\consolefont.cpp" />
-				<File RelativePath="..\..\graphics\fonts\newfont.cpp" />
-				<File RelativePath="..\..\graphics\fonts\newfont_big.cpp" />
-				<File RelativePath="..\..\graphics\fonts\scummfont.cpp" />
+		<Filter	Name="icons">
+			<File RelativePath="..\..\icons\scummvm.ico" />
+		</Filter>
+		<Filter	Name="sound">
+			<Filter	Name="mods">
+				<File RelativePath="..\..\sound\mods\infogrames.cpp" />
+				<File RelativePath="..\..\sound\mods\infogrames.h" />
+				<File RelativePath="..\..\sound\mods\maxtrax.cpp" />
+				<File RelativePath="..\..\sound\mods\maxtrax.h" />
+				<File RelativePath="..\..\sound\mods\module.cpp" />
+				<File RelativePath="..\..\sound\mods\module.h" />
+				<File RelativePath="..\..\sound\mods\paula.cpp" />
+				<File RelativePath="..\..\sound\mods\paula.h" />
+				<File RelativePath="..\..\sound\mods\protracker.cpp" />
+				<File RelativePath="..\..\sound\mods\protracker.h" />
+				<File RelativePath="..\..\sound\mods\rjp1.cpp" />
+				<File RelativePath="..\..\sound\mods\rjp1.h" />
+				<File RelativePath="..\..\sound\mods\soundfx.cpp" />
+				<File RelativePath="..\..\sound\mods\soundfx.h" />
+				<File RelativePath="..\..\sound\mods\tfmx.cpp" />
+				<File RelativePath="..\..\sound\mods\tfmx.h" />
 			</Filter>
-			<Filter Name="video">
-				<File RelativePath="..\..\graphics\video\avi_decoder.cpp" />
-				<File RelativePath="..\..\graphics\video\avi_decoder.h" />			
-				<File RelativePath="..\..\graphics\video\dxa_decoder.cpp" />
-				<File RelativePath="..\..\graphics\video\dxa_decoder.h" />
-				<File RelativePath="..\..\graphics\video\flic_decoder.cpp" />
-				<File RelativePath="..\..\graphics\video\flic_decoder.h" />
-				<File RelativePath="..\..\graphics\video\mpeg_player.cpp" />
-				<File RelativePath="..\..\graphics\video\mpeg_player.h" />
-				<File RelativePath="..\..\graphics\video\smk_decoder.cpp" />
-				<File RelativePath="..\..\graphics\video\smk_decoder.h" />
-				<File RelativePath="..\..\graphics\video\video_player.cpp" />
-				<File RelativePath="..\..\graphics\video\video_player.h" />
-				<Filter Name="codecs">
-				<File RelativePath="..\..\graphics\video\codecs\codec.h" />
-				<File RelativePath="..\..\graphics\video\codecs\msvideo1.cpp" />
-				<File RelativePath="..\..\graphics\video\codecs\msvideo1.h" />
+			<Filter	Name="softsynth">
+				<Filter	Name="mt32">
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\freeverb.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\i386.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\module.mk" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32_file.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\mt32emu.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\part.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partial.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\partialManager.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\structures.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\synth.h" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.cpp" />
+					<File RelativePath="..\..\sound\softsynth\mt32\tables.h" />
 				</Filter>
-				<Filter Name="coktelvideo">
-					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp" />
-					<File RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h" />
-					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp" />
-					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3.h" />
-					<File RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h" />
+				<Filter	Name="opl">
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\dosbox.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.cpp" />
+					<File RelativePath="..\..\sound\softsynth\opl\mame.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_impl.h" />
+					<File RelativePath="..\..\sound\softsynth\opl\opl_inc.h" />
 				</Filter>
+				<File RelativePath="..\..\sound\softsynth\adlib.cpp" />
+				<File RelativePath="..\..\sound\softsynth\emumidi.h" />
+				<File RelativePath="..\..\sound\softsynth\fluidsynth.cpp" />
+				<File RelativePath="..\..\sound\softsynth\mt32.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.cpp" />
+				<File RelativePath="..\..\sound\softsynth\pcspk.h" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.cpp" />
+				<File RelativePath="..\..\sound\softsynth\ym2612.h" />
 			</Filter>
+			<File RelativePath="..\..\sound\adpcm.cpp" />
+			<File RelativePath="..\..\sound\adpcm.h" />
+			<File RelativePath="..\..\sound\aiff.cpp" />
+			<File RelativePath="..\..\sound\aiff.h" />
+			<File RelativePath="..\..\sound\audiocd.cpp" />
+			<File RelativePath="..\..\sound\audiocd.h" />
+			<File RelativePath="..\..\sound\audiostream.cpp" />
+			<File RelativePath="..\..\sound\audiostream.h" />
+			<File RelativePath="..\..\sound\flac.cpp" />
+			<File RelativePath="..\..\sound\flac.h" />
+			<File RelativePath="..\..\sound\fmopl.cpp" />
+			<File RelativePath="..\..\sound\fmopl.h" />
+			<File RelativePath="..\..\sound\iff_sound.cpp" />
+			<File RelativePath="..\..\sound\iff_sound.h" />
+			<File RelativePath="..\..\sound\mididrv.cpp" />
+			<File RelativePath="..\..\sound\mididrv.h" />
+			<File RelativePath="..\..\sound\midiparser.cpp" />
+			<File RelativePath="..\..\sound\midiparser.h" />
+			<File RelativePath="..\..\sound\midiparser_smf.cpp" />
+			<File RelativePath="..\..\sound\midiparser_xmidi.cpp" />
+			<File RelativePath="..\..\sound\mixer.cpp" />
+			<File RelativePath="..\..\sound\mixer.h" />
+			<File RelativePath="..\..\sound\mixer_intern.h" />
+			<File RelativePath="..\..\sound\module.mk" />
+			<File RelativePath="..\..\sound\mp3.cpp" />
+			<File RelativePath="..\..\sound\mp3.h" />
+			<File RelativePath="..\..\sound\mpu401.cpp" />
+			<File RelativePath="..\..\sound\mpu401.h" />
+			<File RelativePath="..\..\sound\musicplugin.cpp" />
+			<File RelativePath="..\..\sound\musicplugin.h" />
+			<File RelativePath="..\..\sound\null.cpp" />
+			<File RelativePath="..\..\sound\rate.cpp" />
+			<File RelativePath="..\..\sound\rate.h" />
+			<File RelativePath="..\..\sound\shorten.cpp" />
+			<File RelativePath="..\..\sound\shorten.h" />
+			<File RelativePath="..\..\sound\timestamp.cpp" />
+			<File RelativePath="..\..\sound\timestamp.h" />
+			<File RelativePath="..\..\sound\vag.cpp" />
+			<File RelativePath="..\..\sound\vag.h" />
+			<File RelativePath="..\..\sound\voc.cpp" />
+			<File RelativePath="..\..\sound\voc.h" />
+			<File RelativePath="..\..\sound\vorbis.cpp" />
+			<File RelativePath="..\..\sound\vorbis.h" />
+			<File RelativePath="..\..\sound\wave.cpp" />
+			<File RelativePath="..\..\sound\wave.h" />
 		</Filter>
-		<Filter Name="engines">
-			<File RelativePath="..\..\engines\advancedDetector.cpp" />
-			<File RelativePath="..\..\engines\advancedDetector.h" />
-			<File RelativePath="..\..\engines\dialogs.cpp" />
-			<File RelativePath="..\..\engines\dialogs.h" />
-			<File RelativePath="..\..\engines\engine.cpp" />
-			<File RelativePath="..\..\engines\engine.h" />
-			<File RelativePath="..\..\engines\game.cpp" />
-			<File RelativePath="..\..\engines\game.h" />
-			<File RelativePath="..\..\engines\metaengine.h" />
-		</Filter>
+		<File RelativePath="..\..\AUTHORS" />
+		<File RelativePath="..\..\COPYING" />
+		<File RelativePath="..\..\COPYING.LGPL" />
+		<File RelativePath="..\..\COPYRIGHT" />
+		<File RelativePath="..\..\NEWS" />
+		<File RelativePath="..\..\README" />
+		<File RelativePath="..\..\TODO" />
 	</Files>
 </VisualStudioProject>
diff --git a/dists/msvc9/sky.vcproj b/dists/msvc9/sky.vcproj
index bc412315b2..14575e2b05 100644
--- a/dists/msvc9/sky.vcproj
+++ b/dists/msvc9/sky.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="sky"
-	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
+	ProjectGUID="{16055389-BE24-4217-899B-5E1E272B4A37}"
 	RootNamespace="sky"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<Filter	Name="music">
@@ -48,6 +51,7 @@
 		<File RelativePath="..\..\engines\sky\intro.h" />
 		<File RelativePath="..\..\engines\sky\logic.cpp" />
 		<File RelativePath="..\..\engines\sky\logic.h" />
+		<File RelativePath="..\..\engines\sky\module.mk" />
 		<File RelativePath="..\..\engines\sky\mouse.cpp" />
 		<File RelativePath="..\..\engines\sky\mouse.h" />
 		<File RelativePath="..\..\engines\sky\rnc_deco.cpp" />
diff --git a/dists/msvc9/sword1.vcproj b/dists/msvc9/sword1.vcproj
index 13dfb89db9..5df50bdb87 100644
--- a/dists/msvc9/sword1.vcproj
+++ b/dists/msvc9/sword1.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="sword1"
-	ProjectGUID="{C8AAE83E-198B-4ECA-A877-166827953979}"
+	ProjectGUID="{617CC004-E2AD-4F38-A18F-5547A2FD667D}"
 	RootNamespace="sword1"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\sword1\animation.cpp" />
@@ -32,6 +35,7 @@
 		<File RelativePath="..\..\engines\sword1\memman.h" />
 		<File RelativePath="..\..\engines\sword1\menu.cpp" />
 		<File RelativePath="..\..\engines\sword1\menu.h" />
+		<File RelativePath="..\..\engines\sword1\module.mk" />
 		<File RelativePath="..\..\engines\sword1\mouse.cpp" />
 		<File RelativePath="..\..\engines\sword1\mouse.h" />
 		<File RelativePath="..\..\engines\sword1\music.cpp" />
diff --git a/dists/msvc9/sword2.vcproj b/dists/msvc9/sword2.vcproj
index bcca55b340..dea150b99d 100644
--- a/dists/msvc9/sword2.vcproj
+++ b/dists/msvc9/sword2.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="sword2"
-	ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"
+	ProjectGUID="{6001C2EE-FCBB-461B-A897-EF41384D46BF}"
 	RootNamespace="sword2"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\sword2\animation.cpp" />
@@ -40,6 +43,7 @@
 		<File RelativePath="..\..\engines\sword2\memory.cpp" />
 		<File RelativePath="..\..\engines\sword2\memory.h" />
 		<File RelativePath="..\..\engines\sword2\menu.cpp" />
+		<File RelativePath="..\..\engines\sword2\module.mk" />
 		<File RelativePath="..\..\engines\sword2\mouse.cpp" />
 		<File RelativePath="..\..\engines\sword2\mouse.h" />
 		<File RelativePath="..\..\engines\sword2\music.cpp" />
diff --git a/dists/msvc9/teenagent.vcproj b/dists/msvc9/teenagent.vcproj
index f048f49605..d416c2b76e 100644
--- a/dists/msvc9/teenagent.vcproj
+++ b/dists/msvc9/teenagent.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="teenagent"
-	ProjectGUID="{F88313A3-8D3A-4146-B38C-84CF62D84F5D}"
+	ProjectGUID="{D0F620CC-2420-4827-A883-7BD6E140FC04}"
 	RootNamespace="teenagent"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\teenagent\actor.cpp" />
@@ -28,6 +31,7 @@
 		<File RelativePath="..\..\engines\teenagent\font.h" />
 		<File RelativePath="..\..\engines\teenagent\inventory.cpp" />
 		<File RelativePath="..\..\engines\teenagent\inventory.h" />
+		<File RelativePath="..\..\engines\teenagent\module.mk" />
 		<File RelativePath="..\..\engines\teenagent\music.cpp" />
 		<File RelativePath="..\..\engines\teenagent\music.h" />
 		<File RelativePath="..\..\engines\teenagent\objects.cpp" />
diff --git a/dists/msvc9/tinsel.vcproj b/dists/msvc9/tinsel.vcproj
index 61b9cc20b2..2e09ff149c 100644
--- a/dists/msvc9/tinsel.vcproj
+++ b/dists/msvc9/tinsel.vcproj
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="tinsel"
-	ProjectGUID="{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
+	ProjectGUID="{914AE00F-53BD-42B3-8C04-A88267553C80}"
 	RootNamespace="tinsel"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
 			<Tool Name="VCCLCompilerTool" DebugInformationFormat="3" />
 		</Configuration>
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops">
+			<Tool Name="VCCLCompilerTool" DebugInformationFormat="3" />
+		</Configuration>
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\tinsel\actors.cpp" />
@@ -58,6 +63,7 @@
 		<File RelativePath="..\..\engines\tinsel\heapmem.h" />
 		<File RelativePath="..\..\engines\tinsel\mareels.cpp" />
 		<File RelativePath="..\..\engines\tinsel\mareels.h" />
+		<File RelativePath="..\..\engines\tinsel\module.mk" />
 		<File RelativePath="..\..\engines\tinsel\move.cpp" />
 		<File RelativePath="..\..\engines\tinsel\move.h" />
 		<File RelativePath="..\..\engines\tinsel\multiobj.cpp" />
diff --git a/dists/msvc9/touche.vcproj b/dists/msvc9/touche.vcproj
index 02167e4cf4..e0f7746bdd 100644
--- a/dists/msvc9/touche.vcproj
+++ b/dists/msvc9/touche.vcproj
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="touche"
-	ProjectGUID="{D4986356-D0BB-4981-924A-854157BDF11F}"
+	ProjectGUID="{40C6A105-B2B5-4E1C-9EFF-E9BF6B8C7693}"
 	RootNamespace="touche"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\touche\detection.cpp" />
@@ -22,6 +25,7 @@
 		<File RelativePath="..\..\engines\touche\menu.cpp" />
 		<File RelativePath="..\..\engines\touche\midi.cpp" />
 		<File RelativePath="..\..\engines\touche\midi.h" />
+		<File RelativePath="..\..\engines\touche\module.mk" />
 		<File RelativePath="..\..\engines\touche\opcodes.cpp" />
 		<File RelativePath="..\..\engines\touche\resource.cpp" />
 		<File RelativePath="..\..\engines\touche\saveload.cpp" />
diff --git a/dists/msvc9/tucker.vcproj b/dists/msvc9/tucker.vcproj
index 5589745a4f..4d4e9fc036 100644
--- a/dists/msvc9/tucker.vcproj
+++ b/dists/msvc9/tucker.vcproj
@@ -1,25 +1,29 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="tucker"
-	ProjectGUID="{FF064FD0-AF6E-11DD-AD8B-0800200C9A66}"
+	ProjectGUID="{A5FFC619-C5A3-4086-B396-1337DDC0B167}"
 	RootNamespace="tucker"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform Name="Win32" />
+		<Platform Name="x64" />
 	</Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
 		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
+		<Configuration Name="Debug|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug64.vsprops" />
+		<Configuration Name="Release|x64" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release64.vsprops" />
 	</Configurations>
 	<Files>
 		<File RelativePath="..\..\engines\tucker\detection.cpp" />
 		<File RelativePath="..\..\engines\tucker\graphics.cpp" />
 		<File RelativePath="..\..\engines\tucker\graphics.h" />
 		<File RelativePath="..\..\engines\tucker\locations.cpp" />
+		<File RelativePath="..\..\engines\tucker\module.mk" />
 		<File RelativePath="..\..\engines\tucker\resource.cpp" />
 		<File RelativePath="..\..\engines\tucker\saveload.cpp" />
 		<File RelativePath="..\..\engines\tucker\sequences.cpp" />