update vc7 project files

svn-id: r10548

1 files changed, 332 insertions, 418 deletions

diff --git a/scummvm.vcproj b/scummvm.vcproj
index 73a63e6a39..24a97f9202 100644
--- a/scummvm.vcproj
+++ b/scummvm.vcproj
@@ -3,8 +3,8 @@
 	ProjectType="Visual C++"
 	Version="7.00"
 	Name="scummvm"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -12,46 +12,41 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\scummvm___Debug"
-			IntermediateDirectory=".\scummvm___Debug"
+			OutputDirectory="vc7_out/scummvm_Debug"
+			IntermediateDirectory="vc7_out/scummvm_Debug"
 			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".,sound,common"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,BYPASS_COPY_PROT"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ADLIB"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\scummvm___Debug/scummvm.pch"
-				AssemblerListingLocation=".\scummvm___Debug/"
-				ObjectFile=".\scummvm___Debug/"
-				ProgramDataBaseFileName=".\scummvm___Debug/"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
+				SuppressStartupBanner="FALSE"
+				DebugInformationFormat="4"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386 /FIXED:NO"
-				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib"
-				OutputFile=".\scummvm___Debug/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib vc7_out/bs2_debug/bs2.lib vc7_out/queen_debug/queen.lib vc7_out/scumm_debug/scumm.lib vc7_out/simon_debug/simon.lib vc7_out/sky_debug/sky.lib"
+				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\scummvm___Debug/scummvm.pdb"
-				SubSystem="1"/>
+				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\scummvm___Debug/scummvm.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -59,9 +54,7 @@
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -69,160 +62,45 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\scummvm___Release"
-			IntermediateDirectory=".\scummvm___Release"
+			OutputDirectory="vc7_out/scummvm_Release"
+			IntermediateDirectory="vc7_out/scummvm_Release"
 			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=".,sound,common"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ADLIB,BYPASS_COPY_PROT"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ADLIB"
 				StringPooling="TRUE"
+				MinimalRebuild="FALSE"
+				ExceptionHandling="FALSE"
 				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
-				PrecompiledHeaderFile=".\scummvm___Release/scummvm.pch"
-				AssemblerListingLocation=".\scummvm___Release/"
-				ObjectFile=".\scummvm___Release/"
-				ProgramDataBaseFileName=".\scummvm___Release/"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				DebugInformationFormat="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib"
-				OutputFile=".\scummvm___Release/scummvm.exe"
+				AdditionalDependencies="winmm.lib sdl.lib vc7_out/bs2_release/bs2.lib vc7_out/queen_release/queen.lib vc7_out/scumm_release/scumm.lib vc7_out/simon_release/simon.lib vc7_out/sky_release/sky.lib"
+				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\scummvm___Release/scummvm.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\scummvm___Release/scummvm.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1053"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="mad mp3 Release|Win32"
-			OutputDirectory=".\scummvm___mad_mp3_Release"
-			IntermediateDirectory=".\scummvm___mad_mp3_Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories=".,sound,common"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				RuntimeTypeInfo="TRUE"
-				PrecompiledHeaderFile=".\scummvm___mad_mp3_Release/scummvm.pch"
-				AssemblerListingLocation=".\scummvm___mad_mp3_Release/"
-				ObjectFile=".\scummvm___mad_mp3_Release/"
-				ProgramDataBaseFileName=".\scummvm___mad_mp3_Release/"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib"
-				OutputFile=".\scummvm___mad_mp3_Release/scummvm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc,libcd"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\scummvm___mad_mp3_Release/scummvm.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\scummvm___mad_mp3_Release/scummvm.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1053"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="mad mp3 Debug|Win32"
-			OutputDirectory=".\scummvm___mad_mp3_Debug"
-			IntermediateDirectory=".\scummvm___mad_mp3_Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".,sound,common"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\scummvm___mad_mp3_Debug/scummvm.pch"
-				AssemblerListingLocation=".\scummvm___mad_mp3_Debug/"
-				ObjectFile=".\scummvm___mad_mp3_Debug/"
-				ProgramDataBaseFileName=".\scummvm___mad_mp3_Debug/"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
+				GenerateDebugInformation="FALSE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386 /FIXED:NO"
-				AdditionalDependencies="sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib"
-				OutputFile=".\scummvm___mad_mp3_Debug/scummvm.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="libc,libcd"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\scummvm___mad_mp3_Debug/scummvm.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\scummvm___mad_mp3_Debug/scummvm.tlb"/>
+				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -230,9 +108,7 @@
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -241,293 +117,331 @@
 	</Configurations>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Name="base"
+			Filter="">
+			<File
+				RelativePath="base\engine.cpp">
+			</File>
+			<File
+				RelativePath="base\engine.h">
+			</File>
+			<File
+				RelativePath="base\gameDetector.cpp">
+			</File>
+			<File
+				RelativePath="base\gameDetector.h">
+			</File>
+			<File
+				RelativePath="base\main.cpp">
+			</File>
+			<File
+				RelativePath="base\plugins.cpp">
+			</File>
+			<File
+				RelativePath="base\plugins.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="common"
+			Filter="">
+			<File
+				RelativePath="common\config-file.cpp">
+			</File>
+			<File
+				RelativePath="common\config-file.h">
+			</File>
+			<File
+				RelativePath="common\file.cpp">
+			</File>
+			<File
+				RelativePath="common\file.h">
+			</File>
+			<File
+				RelativePath="common\list.h">
+			</File>
+			<File
+				RelativePath="common\map.h">
+			</File>
+			<File
+				RelativePath="common\rect.h">
+			</File>
+			<File
+				RelativePath="common\savefile.cpp">
+			</File>
+			<File
+				RelativePath="common\savefile.h">
+			</File>
+			<File
+				RelativePath="common\scaler.cpp">
+			</File>
+			<File
+				RelativePath="common\scaler.h">
+			</File>
+			<File
+				RelativePath="common\scummsys.h">
+			</File>
+			<File
+				RelativePath="common\stdafx.h">
+			</File>
+			<File
+				RelativePath="common\str.cpp">
+			</File>
+			<File
+				RelativePath="common\str.h">
+			</File>
+			<File
+				RelativePath="common\system.h">
+			</File>
+			<File
+				RelativePath="common\timer.cpp">
+			</File>
+			<File
+				RelativePath="common\timer.h">
+			</File>
+			<File
+				RelativePath="common\util.cpp">
+			</File>
+			<File
+				RelativePath="common\util.h">
+			</File>
 			<Filter
-				Name="common"
+				Name="scaler"
 				Filter="">
 				<File
-					RelativePath=".\common\config-file.cpp">
-				</File>
-				<File
-					RelativePath=".\common\config-file.h">
-				</File>
-				<File
-					RelativePath=".\common\file.cpp">
-				</File>
-				<File
-					RelativePath=".\common\file.h">
-				</File>
-				<File
-					RelativePath=".\common\list.h">
-				</File>
-				<File
-					RelativePath=".\common\map.h">
-				</File>
-				<File
-					RelativePath=".\common\rect.h">
-				</File>
-				<File
-					RelativePath=".\common\savefile.cpp">
-				</File>
-				<File
-					RelativePath=".\common\savefile.h">
-				</File>
-				<File
-					RelativePath=".\common\scaler.cpp">
-				</File>
-				<File
-					RelativePath=".\common\scaler.h">
-				</File>
-				<File
-					RelativePath=".\common\scummsys.h">
-				</File>
-				<File
-					RelativePath=".\common\stdafx.h">
-				</File>
-				<File
-					RelativePath=".\common\str.cpp">
-				</File>
-				<File
-					RelativePath=".\common\str.h">
-				</File>
-				<File
-					RelativePath=".\common\system.h">
+					RelativePath="common\scaler\2xsai.cpp">
 				</File>
 				<File
-					RelativePath=".\common\timer.cpp">
+					RelativePath="common\scaler\aspect.cpp">
 				</File>
 				<File
-					RelativePath=".\common\timer.h">
+					RelativePath="common\scaler\hq2x.cpp">
 				</File>
 				<File
-					RelativePath=".\common\util.cpp">
+					RelativePath="common\scaler\hq3x.cpp">
 				</File>
 				<File
-					RelativePath=".\common\util.h">
+					RelativePath="common\scaler\intern.h">
 				</File>
 			</Filter>
+		</Filter>
+		<Filter
+			Name="sound"
+			Filter="">
+			<File
+				RelativePath="sound\audiostream.cpp">
+			</File>
+			<File
+				RelativePath="sound\audiostream.h">
+			</File>
+			<File
+				RelativePath="sound\fmopl.cpp">
+			</File>
+			<File
+				RelativePath="sound\fmopl.h">
+			</File>
+			<File
+				RelativePath="sound\mididrv.h">
+			</File>
+			<File
+				RelativePath="sound\midiparser.cpp">
+			</File>
+			<File
+				RelativePath="sound\midiparser.h">
+			</File>
+			<File
+				RelativePath="sound\midiparser_smf.cpp">
+			</File>
+			<File
+				RelativePath="sound\midiparser_xmidi.cpp">
+			</File>
+			<File
+				RelativePath="sound\mixer.cpp">
+			</File>
+			<File
+				RelativePath="sound\mixer.h">
+			</File>
+			<File
+				RelativePath="sound\mpu401.cpp">
+			</File>
+			<File
+				RelativePath="sound\mpu401.h">
+			</File>
+			<File
+				RelativePath="sound\rate.cpp">
+			</File>
+			<File
+				RelativePath="sound\rate.h">
+			</File>
+			<File
+				RelativePath="sound\resample.cpp">
+			</File>
+			<File
+				RelativePath="sound\resample.h">
+			</File>
+			<File
+				RelativePath="sound\voc.cpp">
+			</File>
+			<File
+				RelativePath="sound\voc.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="txt"
+			Filter="">
+			<File
+				RelativePath="COPYING">
+			</File>
+			<File
+				RelativePath="NEWS">
+			</File>
+			<File
+				RelativePath="README">
+			</File>
+			<File
+				RelativePath="TODO">
+			</File>
+		</Filter>
+		<Filter
+			Name="rsc"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			<File
+				RelativePath="scummvm.ico">
+			</File>
+			<File
+				RelativePath="scummvm.rc">
+			</File>
+		</Filter>
+		<Filter
+			Name="backends"
+			Filter="">
+			<File
+				RelativePath="backends\intern.h">
+			</File>
 			<Filter
-				Name="sound"
+				Name="sdl"
 				Filter="">
 				<File
-					RelativePath="sound\audiostream.cpp">
-				</File>
-				<File
-					RelativePath="sound\audiostream.h">
-				</File>
-				<File
-					RelativePath=".\sound\fmopl.cpp">
+					RelativePath="backends\sdl\sdl-common.cpp">
 				</File>
 				<File
-					RelativePath=".\sound\fmopl.h">
+					RelativePath="backends\sdl\sdl-common.h">
 				</File>
 				<File
-					RelativePath=".\sound\mididrv.h">
-				</File>
-				<File
-					RelativePath=".\sound\midiparser.cpp">
-				</File>
-				<File
-					RelativePath=".\sound\midiparser.h">
-				</File>
-				<File
-					RelativePath=".\sound\midiparser_smf.cpp">
-				</File>
-				<File
-					RelativePath=".\sound\midiparser_xmidi.cpp">
-				</File>
-				<File
-					RelativePath=".\sound\mixer.cpp">
-				</File>
-				<File
-					RelativePath=".\sound\mixer.h">
-				</File>
-				<File
-					RelativePath=".\sound\mpu401.cpp">
-				</File>
-				<File
-					RelativePath=".\sound\mpu401.h">
-				</File>
-				<File
-					RelativePath="sound\rate.cpp">
-				</File>
-				<File
-					RelativePath="sound\rate.h">
-				</File>
-				<File
-					RelativePath="sound\voc.cpp">
-				</File>
-				<File
-					RelativePath="sound\voc.h">
+					RelativePath="backends\sdl\sdl.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="gui"
+				Name="fs"
 				Filter="">
 				<File
-					RelativePath=".\gui\EditTextWidget.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\EditTextWidget.h">
-				</File>
-				<File
-					RelativePath=".\gui\ListWidget.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\ListWidget.h">
-				</File>
-				<File
-					RelativePath=".\gui\PopUpWidget.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\PopUpWidget.h">
-				</File>
-				<File
-					RelativePath=".\gui\ScrollBarWidget.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\ScrollBarWidget.h">
+					RelativePath="backends\fs\fs.h">
 				</File>
 				<File
-					RelativePath="gui\about.cpp">
-				</File>
-				<File
-					RelativePath="gui\about.h">
-				</File>
-				<File
-					RelativePath=".\gui\browser.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\browser.h">
-				</File>
-				<File
-					RelativePath=".\gui\chooser.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\chooser.h">
-				</File>
-				<File
-					RelativePath=".\gui\console.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\console.h">
-				</File>
-				<File
-					RelativePath=".\gui\dialog.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\dialog.h">
-				</File>
-				<File
-					RelativePath=".\gui\launcher.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\launcher.h">
-				</File>
-				<File
-					RelativePath=".\gui\message.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\message.h">
-				</File>
-				<File
-					RelativePath=".\gui\newgui.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\newgui.h">
-				</File>
-				<File
-					RelativePath=".\gui\options.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\options.h">
-				</File>
-				<File
-					RelativePath=".\gui\widget.cpp">
-				</File>
-				<File
-					RelativePath=".\gui\widget.h">
+					RelativePath="backends\fs\windows\windows-fs.cpp">
 				</File>
 			</Filter>
 			<Filter
-				Name="backends"
+				Name="midi"
 				Filter="">
-				<Filter
-					Name="sdl"
-					Filter="">
-					<File
-						RelativePath=".\backends\sdl\sdl-common.cpp">
-					</File>
-					<File
-						RelativePath=".\backends\sdl\sdl-common.h">
-					</File>
-					<File
-						RelativePath=".\backends\sdl\sdl.cpp">
-					</File>
-				</Filter>
-				<Filter
-					Name="fs"
-					Filter="">
-					<File
-						RelativePath=".\backends\fs\fs.h">
-					</File>
-					<File
-						RelativePath=".\backends\fs\windows\windows-fs.cpp">
-					</File>
-				</Filter>
-				<Filter
-					Name="midi"
-					Filter="">
-					<File
-						RelativePath=".\backends\midi\adlib.cpp">
-					</File>
-					<File
-						RelativePath=".\backends\midi\null.cpp">
-					</File>
-					<File
-						RelativePath=".\backends\midi\windows.cpp">
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="base"
-				Filter="">
-				<File
-					RelativePath="base\engine.cpp">
-				</File>
-				<File
-					RelativePath="base\engine.h">
-				</File>
 				<File
-					RelativePath="base\gameDetector.cpp">
+					RelativePath="backends\midi\adlib.cpp">
 				</File>
 				<File
-					RelativePath="base\gameDetector.h">
+					RelativePath="backends\midi\null.cpp">
 				</File>
 				<File
-					RelativePath="base\main.cpp">
-				</File>
-				<File
-					RelativePath="base\plugins.cpp">
-				</File>
-				<File
-					RelativePath="base\plugins.h">
+					RelativePath="backends\midi\windows.cpp">
 				</File>
 			</Filter>
 		</Filter>
-		<File
-			RelativePath=".\NEWS">
-		</File>
-		<File
-			RelativePath=".\README">
-		</File>
-		<File
-			RelativePath=".\scummvm.ico">
-		</File>
-		<File
-			RelativePath=".\scummvm.rc">
-		</File>
+		<Filter
+			Name="gui"
+			Filter="">
+			<File
+				RelativePath="gui\EditTextWidget.cpp">
+			</File>
+			<File
+				RelativePath="gui\EditTextWidget.h">
+			</File>
+			<File
+				RelativePath="gui\ListWidget.cpp">
+			</File>
+			<File
+				RelativePath="gui\ListWidget.h">
+			</File>
+			<File
+				RelativePath="gui\PopUpWidget.cpp">
+			</File>
+			<File
+				RelativePath="gui\PopUpWidget.h">
+			</File>
+			<File
+				RelativePath="gui\ScrollBarWidget.cpp">
+			</File>
+			<File
+				RelativePath="gui\ScrollBarWidget.h">
+			</File>
+			<File
+				RelativePath="gui\about.cpp">
+			</File>
+			<File
+				RelativePath="gui\about.h">
+			</File>
+			<File
+				RelativePath="gui\browser.cpp">
+			</File>
+			<File
+				RelativePath="gui\browser.h">
+			</File>
+			<File
+				RelativePath="gui\chooser.cpp">
+			</File>
+			<File
+				RelativePath="gui\chooser.h">
+			</File>
+			<File
+				RelativePath="gui\console.cpp">
+			</File>
+			<File
+				RelativePath="gui\console.h">
+			</File>
+			<File
+				RelativePath="gui\dialog.cpp">
+			</File>
+			<File
+				RelativePath="gui\dialog.h">
+			</File>
+			<File
+				RelativePath="gui\launcher.cpp">
+			</File>
+			<File
+				RelativePath="gui\launcher.h">
+			</File>
+			<File
+				RelativePath="gui\message.cpp">
+			</File>
+			<File
+				RelativePath="gui\message.h">
+			</File>
+			<File
+				RelativePath="gui\newgui.cpp">
+			</File>
+			<File
+				RelativePath="gui\newgui.h">
+			</File>
+			<File
+				RelativePath="gui\options.cpp">
+			</File>
+			<File
+				RelativePath="gui\options.h">
+			</File>
+			<File
+				RelativePath="gui\widget.cpp">
+			</File>
+			<File
+				RelativePath="gui\widget.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>