[Scummvm-cvs-logs] CVS: scummvm queen.vcproj,NONE,1.1 bs2.vcproj,1.5,1.6 scumm.vcproj,1.12,1.13 scummvm.sln,1.3,1.4 scummvm.vcproj,1.13,1.14 simon.vcproj,1.4,1.5 sky.vcproj,1.5,1.6

Pawel Kolodziejski aquadran at users.sourceforge.net
Thu Oct 2 13:24:04 CEST 2003


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv7620

Modified Files:
	bs2.vcproj scumm.vcproj scummvm.sln scummvm.vcproj 
	simon.vcproj sky.vcproj 
Added Files:
	queen.vcproj 
Log Message:
update vc7 project files

--- NEW FILE: queen.vcproj ---
<?xml version="1.0" encoding = "windows-1250"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.00"
	Name="queen"
	ProjectGUID="{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"
	Keyword="Win32Proj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="vc7_out/queen_Debug"
			IntermediateDirectory="vc7_out/queen_Debug"
			ConfigurationType="4"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="."
				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
				MinimalRebuild="TRUE"
				ExceptionHandling="FALSE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="1"
				BufferSecurityCheck="TRUE"
				EnableFunctionLevelLinking="TRUE"
				ForceConformanceInForLoopScope="TRUE"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				WarnAsError="TRUE"
				SuppressStartupBanner="FALSE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/queen.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="vc7_out/queen_Release"
			IntermediateDirectory="vc7_out/queen_Release"
			ConfigurationType="4"
			CharacterSet="2"
			WholeProgramOptimization="TRUE">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				OmitFramePointers="TRUE"
				AdditionalIncludeDirectories="."
				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
				StringPooling="TRUE"
				ExceptionHandling="FALSE"
				RuntimeLibrary="0"
				BufferSecurityCheck="FALSE"
				EnableFunctionLevelLinking="FALSE"
				ForceConformanceInForLoopScope="TRUE"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				WarnAsError="TRUE"
				DebugInformationFormat="0"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLibrarianTool"
				OutputFile="$(OutDir)/queen.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
		</Configuration>
	</Configurations>
	<Files>
		<File
			RelativePath="queen\cutaway.cpp">
		</File>
		<File
			RelativePath="queen\cutaway.h">
		</File>
		<File
			RelativePath="queen\graphics.cpp">
		</File>
		<File
			RelativePath="queen\graphics.h">
		</File>
		<File
			RelativePath="queen\logic.cpp">
		</File>
		<File
			RelativePath="queen\logic.h">
		</File>
		<File
			RelativePath="queen\queen.cpp">
		</File>
		<File
			RelativePath="queen\queen.h">
		</File>
		<File
			RelativePath="queen\resource.cpp">
		</File>
		<File
			RelativePath="queen\resource.h">
		</File>
		<File
			RelativePath="queen\restables.cpp">
		</File>
		<File
			RelativePath="queen\version.cpp">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: bs2.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bs2.vcproj	25 Aug 2003 19:36:26 -0000	1.5
+++ bs2.vcproj	2 Oct 2003 20:22:45 -0000	1.6
@@ -3,141 +3,41 @@
 	ProjectType="Visual C++"

 	Version="7.00"

 	Name="bs2"

-	ProjectGUID="{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{6CC3E421-779D-4E80-8100-520886A0F9FF}"

+	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

 	</Platforms>

 	<Configurations>

 		<Configuration

-			Name="mad mp3 Release|Win32"

-			OutputDirectory=".\bs2___mad_mp3_Release"

-			IntermediateDirectory=".\bs2___mad_mp3_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\bs2___mad_mp3_Release/bs2.pch"

-				AssemblerListingLocation=".\bs2___mad_mp3_Release/"

-				ObjectFile=".\bs2___mad_mp3_Release/"

-				ProgramDataBaseFileName=".\bs2___mad_mp3_Release/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\bs2___mad_mp3_Release\bs2.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\bs2___Debug"

-			IntermediateDirectory=".\bs2___Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\bs2___Debug/bs2.pch"

-				AssemblerListingLocation=".\bs2___Debug/"

-				ObjectFile=".\bs2___Debug/"

-				ProgramDataBaseFileName=".\bs2___Debug/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\bs2___Debug\bs2.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="mad mp3 Debug|Win32"

-			OutputDirectory=".\bs2___mad_mp3_Debug"

-			IntermediateDirectory=".\bs2___mad_mp3_Debug"

+			OutputDirectory="vc7_out/bs2_Debug"

+			IntermediateDirectory="vc7_out/bs2_Debug"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

 			CharacterSet="2">

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"

+				MinimalRebuild="TRUE"

+				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\bs2___mad_mp3_Debug/bs2.pch"

-				AssemblerListingLocation=".\bs2___mad_mp3_Debug/"

-				ObjectFile=".\bs2___mad_mp3_Debug/"

-				ProgramDataBaseFileName=".\bs2___mad_mp3_Debug/"

+				BufferSecurityCheck="TRUE"

+				EnableFunctionLevelLinking="TRUE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

+				SuppressStartupBanner="FALSE"

+				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\bs2___mad_mp3_Debug\bs2.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/bs2.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -147,45 +47,39 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\bs2___Release"

-			IntermediateDirectory=".\bs2___Release"

+			OutputDirectory="vc7_out/bs2_Release"

+			IntermediateDirectory="vc7_out/bs2_Release"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			CharacterSet="2"

+			WholeProgramOptimization="TRUE">

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

 				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				OmitFramePointers="TRUE"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"

 				StringPooling="TRUE"

+				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\bs2___Release/bs2.pch"

-				AssemblerListingLocation=".\bs2___Release/"

-				ObjectFile=".\bs2___Release/"

-				ProgramDataBaseFileName=".\bs2___Release/"

+				BufferSecurityCheck="FALSE"

+				EnableFunctionLevelLinking="FALSE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				DebugInformationFormat="0"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\bs2___Release\bs2.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/bs2.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -195,268 +89,253 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 	</Configurations>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="bs2\anims.cpp">

-			</File>

-			<File

-				RelativePath="bs2\anims.h">

-			</File>

-			<File

-				RelativePath="bs2\build_display.cpp">

-			</File>

-			<File

-				RelativePath="bs2\build_display.h">

-			</File>

-			<File

-				RelativePath="bs2\console.cpp">

-			</File>

-			<File

-				RelativePath="bs2\console.h">

-			</File>

-			<File

-				RelativePath="bs2\controls.cpp">

-			</File>

-			<File

-				RelativePath="bs2\controls.h">

-			</File>

-			<File

-				RelativePath="bs2\credits.h">

-			</File>

-			<File

-				RelativePath="bs2\debug.cpp">

-			</File>

-			<File

-				RelativePath="bs2\debug.h">

-			</File>

-			<File

-				RelativePath="bs2\defs.h">

-			</File>

-			<File

-				RelativePath="bs2\events.cpp">

-			</File>

-			<File

-				RelativePath="bs2\events.h">

-			</File>

-			<File

-				RelativePath="bs2\function.cpp">

-			</File>

-			<File

-				RelativePath="bs2\function.h">

-			</File>

-			<File

-				RelativePath="bs2\header.h">

-			</File>

-			<File

-				RelativePath="bs2\icons.cpp">

-			</File>

-			<File

-				RelativePath="bs2\icons.h">

-			</File>

-			<File

-				RelativePath="bs2\interpreter.cpp">

-			</File>

-			<File

-				RelativePath="bs2\interpreter.h">

-			</File>

-			<File

-				RelativePath="bs2\layers.cpp">

-			</File>

-			<File

-				RelativePath="bs2\layers.h">

-			</File>

-			<File

-				RelativePath="bs2\logic.cpp">

-			</File>

-			<File

-				RelativePath="bs2\logic.h">

-			</File>

-			<File

-				RelativePath="bs2\maketext.cpp">

-			</File>

-			<File

-				RelativePath="bs2\maketext.h">

-			</File>

-			<File

-				RelativePath="bs2\mem_view.cpp">

-			</File>

-			<File

-				RelativePath="bs2\mem_view.h">

-			</File>

-			<File

-				RelativePath="bs2\memory.cpp">

-			</File>

-			<File

-				RelativePath="bs2\memory.h">

-			</File>

-			<File

-				RelativePath="bs2\mouse.cpp">

-			</File>

-			<File

-				RelativePath="bs2\mouse.h">

-			</File>

-			<File

-				RelativePath="bs2\object.h">

-			</File>

-			<File

-				RelativePath="bs2\protocol.cpp">

-			</File>

-			<File

-				RelativePath="bs2\protocol.h">

-			</File>

+			Name="driver"

+			Filter="">

 			<File

-				RelativePath="bs2\resman.cpp">

+				RelativePath="bs2\driver\_console.cpp">

 			</File>

 			<File

-				RelativePath="bs2\resman.h">

+				RelativePath="bs2\driver\_console.h">

 			</File>

 			<File

-				RelativePath="bs2\router.cpp">

+				RelativePath="bs2\driver\_mouse.cpp">

 			</File>

 			<File

-				RelativePath="bs2\router.h">

+				RelativePath="bs2\driver\_mouse.h">

 			</File>

 			<File

-				RelativePath="bs2\save_rest.cpp">

+				RelativePath="bs2\driver\d_draw.cpp">

 			</File>

 			<File

-				RelativePath="bs2\save_rest.h">

+				RelativePath="bs2\driver\d_draw.h">

 			</File>

 			<File

-				RelativePath="bs2\scroll.cpp">

+				RelativePath="bs2\driver\d_sound.cpp">

 			</File>

 			<File

-				RelativePath="bs2\scroll.h">

+				RelativePath="bs2\driver\d_sound.h">

 			</File>

 			<File

-				RelativePath="bs2\sound.cpp">

+				RelativePath="bs2\driver\driver96.h">

 			</File>

 			<File

-				RelativePath="bs2\sound.h">

+				RelativePath="bs2\driver\keyboard.cpp">

 			</File>

 			<File

-				RelativePath="bs2\speech.cpp">

+				RelativePath="bs2\driver\keyboard.h">

 			</File>

 			<File

-				RelativePath="bs2\speech.h">

+				RelativePath="bs2\driver\language.cpp">

 			</File>

 			<File

-				RelativePath="bs2\startup.cpp">

+				RelativePath="bs2\driver\menu.cpp">

 			</File>

 			<File

-				RelativePath="bs2\startup.h">

+				RelativePath="bs2\driver\menu.h">

 			</File>

 			<File

-				RelativePath="bs2\sword2.cpp">

+				RelativePath="bs2\driver\misc.cpp">

 			</File>

 			<File

-				RelativePath="bs2\sword2.h">

+				RelativePath="bs2\driver\palette.cpp">

 			</File>

 			<File

-				RelativePath="bs2\sync.cpp">

+				RelativePath="bs2\driver\palette.h">

 			</File>

 			<File

-				RelativePath="bs2\sync.h">

+				RelativePath="bs2\driver\rdwin.cpp">

 			</File>

 			<File

-				RelativePath="bs2\tony_gsdk.cpp">

+				RelativePath="bs2\driver\rdwin.h">

 			</File>

 			<File

-				RelativePath="bs2\tony_gsdk.h">

+				RelativePath="bs2\driver\render.cpp">

 			</File>

 			<File

-				RelativePath="bs2\walker.cpp">

+				RelativePath="bs2\driver\render.h">

 			</File>

 			<File

-				RelativePath="bs2\walker.h">

+				RelativePath="bs2\driver\sprite.cpp">

 			</File>

-			<Filter

-				Name="drivers"

-				Filter="">

-				<File

-					RelativePath="bs2\driver\_console.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\_console.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\_mouse.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\_mouse.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\d_draw.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\d_draw.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\d_sound.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\d_sound.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\ddutil.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\driver96.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\keyboard.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\keyboard.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\language.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\menu.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\menu.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\misc.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\mouse.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\palette.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\palette.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\rdwin.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\rdwin.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\render.cpp">

-				</File>

-				<File

-					RelativePath="bs2\driver\render.h">

-				</File>

-				<File

-					RelativePath="bs2\driver\sprite.cpp">

-				</File>

-			</Filter>

 		</Filter>

+		<File

+			RelativePath="bs2\anims.cpp">

+		</File>

+		<File

+			RelativePath="bs2\anims.h">

+		</File>

+		<File

+			RelativePath="bs2\build_display.cpp">

+		</File>

+		<File

+			RelativePath="bs2\build_display.h">

+		</File>

+		<File

+			RelativePath="bs2\console.cpp">

+		</File>

+		<File

+			RelativePath="bs2\console.h">

+		</File>

+		<File

+			RelativePath="bs2\controls.cpp">

+		</File>

+		<File

+			RelativePath="bs2\controls.h">

+		</File>

+		<File

+			RelativePath="bs2\credits.h">

+		</File>

+		<File

+			RelativePath="bs2\debug.cpp">

+		</File>

+		<File

+			RelativePath="bs2\debug.h">

+		</File>

+		<File

+			RelativePath="bs2\defs.h">

+		</File>

+		<File

+			RelativePath="bs2\events.cpp">

+		</File>

+		<File

+			RelativePath="bs2\events.h">

+		</File>

+		<File

+			RelativePath="bs2\function.cpp">

+		</File>

+		<File

+			RelativePath="bs2\function.h">

+		</File>

+		<File

+			RelativePath="bs2\header.h">

+		</File>

+		<File

+			RelativePath="bs2\icons.cpp">

+		</File>

+		<File

+			RelativePath="bs2\icons.h">

+		</File>

+		<File

+			RelativePath="bs2\interpreter.cpp">

+		</File>

+		<File

+			RelativePath="bs2\interpreter.h">

+		</File>

+		<File

+			RelativePath="bs2\layers.cpp">

+		</File>

+		<File

+			RelativePath="bs2\layers.h">

+		</File>

+		<File

+			RelativePath="bs2\logic.cpp">

+		</File>

+		<File

+			RelativePath="bs2\logic.h">

+		</File>

+		<File

+			RelativePath="bs2\maketext.cpp">

+		</File>

+		<File

+			RelativePath="bs2\maketext.h">

+		</File>

+		<File

+			RelativePath="bs2\mem_view.cpp">

+		</File>

+		<File

+			RelativePath="bs2\memory.cpp">

+		</File>

+		<File

+			RelativePath="bs2\memory.h">

+		</File>

+		<File

+			RelativePath="bs2\mouse.cpp">

+		</File>

+		<File

+			RelativePath="bs2\mouse.h">

+		</File>

+		<File

+			RelativePath="bs2\object.h">

+		</File>

+		<File

+			RelativePath="bs2\protocol.cpp">

+		</File>

+		<File

+			RelativePath="bs2\protocol.h">

+		</File>

+		<File

+			RelativePath="bs2\resman.cpp">

+		</File>

+		<File

+			RelativePath="bs2\resman.h">

+		</File>

+		<File

+			RelativePath="bs2\router.cpp">

+		</File>

+		<File

+			RelativePath="bs2\router.h">

+		</File>

+		<File

+			RelativePath="bs2\save_rest.cpp">

+		</File>

+		<File

+			RelativePath="bs2\save_rest.h">

+		</File>

+		<File

+			RelativePath="bs2\scroll.cpp">

+		</File>

+		<File

+			RelativePath="bs2\scroll.h">

+		</File>

+		<File

+			RelativePath="bs2\sound.cpp">

+		</File>

+		<File

+			RelativePath="bs2\sound.h">

+		</File>

+		<File

+			RelativePath="bs2\speech.cpp">

+		</File>

+		<File

+			RelativePath="bs2\speech.h">

+		</File>

+		<File

+			RelativePath="bs2\startup.cpp">

+		</File>

+		<File

+			RelativePath="bs2\startup.h">

+		</File>

+		<File

+			RelativePath="bs2\sword2.cpp">

+		</File>

+		<File

+			RelativePath="bs2\sword2.h">

+		</File>

+		<File

+			RelativePath="bs2\sync.cpp">

+		</File>

+		<File

+			RelativePath="bs2\sync.h">

+		</File>

+		<File

+			RelativePath="bs2\tony_gsdk.cpp">

+		</File>

+		<File

+			RelativePath="bs2\tony_gsdk.h">

+		</File>

+		<File

+			RelativePath="bs2\walker.cpp">

+		</File>

+		<File

+			RelativePath="bs2\walker.h">

+		</File>

 	</Files>

 	<Globals>

 	</Globals>


Index: scumm.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.vcproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- scumm.vcproj	25 Sep 2003 06:08:31 -0000	1.12
+++ scumm.vcproj	2 Oct 2003 20:22:45 -0000	1.13
@@ -3,93 +3,42 @@
 	ProjectType="Visual C++"

 	Version="7.00"

 	Name="scumm"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"

+	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

 	</Platforms>

 	<Configurations>

 		<Configuration

-			Name="mad mp3 Debug|Win32"

-			OutputDirectory=".\scumm___mad_mp3_Debug"

-			IntermediateDirectory=".\scumm___mad_mp3_Debug"

+			Name="Debug|Win32"

+			OutputDirectory="vc7_out/scumm_Debug"

+			IntermediateDirectory="vc7_out/scumm_Debug"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			CharacterSet="2"

+			WholeProgramOptimization="FALSE">

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"

+				MinimalRebuild="TRUE"

+				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\scumm___mad_mp3_Debug/scumm.pch"

-				AssemblerListingLocation=".\scumm___mad_mp3_Debug/"

-				ObjectFile=".\scumm___mad_mp3_Debug/"

-				ProgramDataBaseFileName=".\scumm___mad_mp3_Debug/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\scumm___mad_mp3_Debug\scumm.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="mad mp3 Release|Win32"

-			OutputDirectory=".\scumm___mad_mp3_Release"

-			IntermediateDirectory=".\scumm___mad_mp3_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

+				BufferSecurityCheck="TRUE"

 				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\scumm___mad_mp3_Release/scumm.pch"

-				AssemblerListingLocation=".\scumm___mad_mp3_Release/"

-				ObjectFile=".\scumm___mad_mp3_Release/"

-				ProgramDataBaseFileName=".\scumm___mad_mp3_Release/"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				SuppressStartupBanner="FALSE"

+				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\scumm___mad_mp3_Release\scumm.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/scumm.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -99,92 +48,40 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\scumm___Release"

-			IntermediateDirectory=".\scumm___Release"

+			OutputDirectory="vc7_out/scumm_Release"

+			IntermediateDirectory="vc7_out/scumm_Release"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			CharacterSet="2"

+			WholeProgramOptimization="TRUE">

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

 				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT"

+				OmitFramePointers="TRUE"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"

 				StringPooling="TRUE"

+				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\scumm___Release/scumm.pch"

-				AssemblerListingLocation=".\scumm___Release/"

-				ObjectFile=".\scumm___Release/"

-				ProgramDataBaseFileName=".\scumm___Release/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\scumm___Release\scumm.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\scumm___Debug"

-			IntermediateDirectory=".\scumm___Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\scumm___Debug/scumm.pch"

-				AssemblerListingLocation=".\scumm___Debug/"

-				ObjectFile=".\scumm___Debug/"

-				ProgramDataBaseFileName=".\scumm___Debug/"

+				BufferSecurityCheck="FALSE"

+				EnableFunctionLevelLinking="FALSE"

+				DisableLanguageExtensions="FALSE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

+				DebugInformationFormat="0"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\scumm___Debug\scumm.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/scumm.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -194,295 +91,289 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 	</Configurations>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath=".\scumm\actor.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\actor.h">

-			</File>

-			<File

-				RelativePath=".\scumm\akos.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\akos.h">

-			</File>

-			<File

-				RelativePath=".\scumm\base-costume.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\base-costume.h">

-			</File>

-			<File

-				RelativePath=".\scumm\bomp.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\bomp.h">

-			</File>

-			<File

-				RelativePath=".\scumm\boxes.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\boxes.h">

-			</File>

-			<File

-				RelativePath=".\scumm\bundle.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\bundle.h">

-			</File>

-			<File

-				RelativePath=".\scumm\camera.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\charset.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\charset.h">

-			</File>

-			<File

-				RelativePath=".\scumm\costume.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\costume.h">

-			</File>

-			<File

-				RelativePath=".\scumm\debugger.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\debugger.h">

-			</File>

-			<File

-				RelativePath=".\scumm\dialogs.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\dialogs.h">

-			</File>

-			<File

-				RelativePath=".\scumm\gfx.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\gfx.h">

-			</File>

-			<File

-				RelativePath=".\scumm\help.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\help.h">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse.h">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse_digi.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse_digi.h">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse_internal.h">

-			</File>

-			<File

-				RelativePath=".\scumm\imuse_player.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\instrument.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\instrument.h">

-			</File>

-			<File

-				RelativePath=".\scumm\intern.h">

-			</File>

-			<File

-				RelativePath=".\scumm\midiparser_eup.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\midiparser_ro.cpp">

-			</File>

-			<File

-				RelativePath="scumm\music.h">

-			</File>

-			<File

-				RelativePath=".\scumm\nut_renderer.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\nut_renderer.h">

-			</File>

-			<File

-				RelativePath=".\scumm\object.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\object.h">

-			</File>

-			<File

-				RelativePath="scumm\player_mod.cpp">

-			</File>

-			<File

-				RelativePath="scumm\player_mod.h">

-			</File>

-			<File

-				RelativePath="scumm\player_v1.cpp">

-			</File>

-			<File

-				RelativePath="scumm\player_v1.h">

-			</File>

-			<File

-				RelativePath=".\scumm\player_v2.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\player_v2.h">

-			</File>

-			<File

-				RelativePath="scumm\player_v2a.cpp">

-			</File>

-			<File

-				RelativePath="scumm\player_v2a.h">

-			</File>

-			<File

-				RelativePath="scumm\player_v3a.cpp">

-			</File>

-			<File

-				RelativePath="scumm\player_v3a.h">

-			</File>

-			<File

-				RelativePath=".\scumm\resource.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\resource.h">

-			</File>

-			<File

-				RelativePath=".\scumm\resource_v2.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\resource_v3.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\resource_v4.cpp">

-			</File>

-			<File

-				RelativePath=".\scumm\saveload.cpp">

-			</File>

+			Name="smush"

+			Filter="">

 			<File

-				RelativePath=".\scumm\saveload.h">

+				RelativePath="scumm\smush\channel.h">

 			</File>

 			<File

-				RelativePath=".\scumm\script.cpp">

+				RelativePath="scumm\smush\chunk.cpp">

 			</File>

 			<File

-				RelativePath="scumm\script.h">

+				RelativePath="scumm\smush\chunk.h">

 			</File>

 			<File

-				RelativePath=".\scumm\script_v2.cpp">

+				RelativePath="scumm\smush\chunk_type.h">

 			</File>

 			<File

-				RelativePath=".\scumm\script_v5.cpp">

+				RelativePath="scumm\smush\codec1.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\script_v6.cpp">

+				RelativePath="scumm\smush\codec37.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\script_v8.cpp">

+				RelativePath="scumm\smush\codec37.h">

 			</File>

 			<File

-				RelativePath=".\scumm\scumm.h">

+				RelativePath="scumm\smush\codec47.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\scummvm.cpp">

+				RelativePath="scumm\smush\codec47.h">

 			</File>

 			<File

-				RelativePath=".\scumm\sound.cpp">

+				RelativePath="scumm\smush\imuse_channel.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\sound.h">

+				RelativePath="scumm\smush\saud_channel.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\string.cpp">

+				RelativePath="scumm\smush\smush_font.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\usage_bits.cpp">

+				RelativePath="scumm\smush\smush_font.h">

 			</File>

 			<File

-				RelativePath=".\scumm\usage_bits.h">

+				RelativePath="scumm\smush\smush_mixer.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\vars.cpp">

+				RelativePath="scumm\smush\smush_mixer.h">

 			</File>

 			<File

-				RelativePath=".\scumm\verbs.cpp">

+				RelativePath="scumm\smush\smush_player.cpp">

 			</File>

 			<File

-				RelativePath=".\scumm\verbs.h">

+				RelativePath="scumm\smush\smush_player.h">

 			</File>

-			<Filter

-				Name="smush"

-				Filter="">

-				<File

-					RelativePath=".\scumm\smush\channel.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\chunk.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\chunk.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\chunk_type.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\codec1.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\codec37.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\codec37.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\codec47.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\codec47.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\imuse_channel.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\saud_channel.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_font.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_font.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_mixer.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_mixer.h">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_player.cpp">

-				</File>

-				<File

-					RelativePath=".\scumm\smush\smush_player.h">

-				</File>

-			</Filter>

 		</Filter>

+		<File

+			RelativePath="scumm\actor.cpp">

+		</File>

+		<File

+			RelativePath="scumm\actor.h">

+		</File>

+		<File

+			RelativePath="scumm\akos.cpp">

+		</File>

+		<File

+			RelativePath="scumm\akos.h">

+		</File>

+		<File

+			RelativePath="scumm\base-costume.cpp">

+		</File>

+		<File

+			RelativePath="scumm\base-costume.h">

+		</File>

+		<File

+			RelativePath="scumm\bomp.cpp">

+		</File>

+		<File

+			RelativePath="scumm\bomp.h">

+		</File>

+		<File

+			RelativePath="scumm\boxes.cpp">

+		</File>

+		<File

+			RelativePath="scumm\boxes.h">

+		</File>

+		<File

+			RelativePath="scumm\bundle.cpp">

+		</File>

+		<File

+			RelativePath="scumm\bundle.h">

+		</File>

+		<File

+			RelativePath="scumm\camera.cpp">

+		</File>

+		<File

+			RelativePath="scumm\charset.cpp">

+		</File>

+		<File

+			RelativePath="scumm\charset.h">

+		</File>

+		<File

+			RelativePath="scumm\costume.cpp">

+		</File>

+		<File

+			RelativePath="scumm\costume.h">

+		</File>

+		<File

+			RelativePath="scumm\debugger.cpp">

+		</File>

+		<File

+			RelativePath="scumm\debugger.h">

+		</File>

+		<File

+			RelativePath="scumm\dialogs.cpp">

+		</File>

+		<File

+			RelativePath="scumm\dialogs.h">

+		</File>

+		<File

+			RelativePath="scumm\gfx.cpp">

+		</File>

+		<File

+			RelativePath="scumm\gfx.h">

+		</File>

+		<File

+			RelativePath="scumm\help.cpp">

+		</File>

+		<File

+			RelativePath="scumm\help.h">

+		</File>

+		<File

+			RelativePath="scumm\imuse.cpp">

+		</File>

+		<File

+			RelativePath="scumm\imuse.h">

+		</File>

+		<File

+			RelativePath="scumm\imuse_digi.cpp">

+		</File>

+		<File

+			RelativePath="scumm\imuse_digi.h">

+		</File>

+		<File

+			RelativePath="scumm\imuse_internal.h">

+		</File>

+		<File

+			RelativePath="scumm\imuse_player.cpp">

+		</File>

+		<File

+			RelativePath="scumm\instrument.cpp">

+		</File>

+		<File

+			RelativePath="scumm\instrument.h">

+		</File>

+		<File

+			RelativePath="scumm\intern.h">

+		</File>

+		<File

+			RelativePath="scumm\midiparser_eup.cpp">

+		</File>

+		<File

+			RelativePath="scumm\midiparser_ro.cpp">

+		</File>

+		<File

+			RelativePath="scumm\music.h">

+		</File>

+		<File

+			RelativePath="scumm\nut_renderer.cpp">

+		</File>

+		<File

+			RelativePath="scumm\nut_renderer.h">

+		</File>

+		<File

+			RelativePath="scumm\object.cpp">

+		</File>

+		<File

+			RelativePath="scumm\object.h">

+		</File>

+		<File

+			RelativePath="scumm\player_mod.cpp">

+		</File>

+		<File

+			RelativePath="scumm\player_mod.h">

+		</File>

+		<File

+			RelativePath="scumm\player_v1.cpp">

+		</File>

+		<File

+			RelativePath="scumm\player_v1.h">

+		</File>

+		<File

+			RelativePath="scumm\player_v2.cpp">

+		</File>

+		<File

+			RelativePath="scumm\player_v2.h">

+		</File>

+		<File

+			RelativePath="scumm\player_v2a.cpp">

+		</File>

+		<File

+			RelativePath="scumm\player_v2a.h">

+		</File>

+		<File

+			RelativePath="scumm\player_v3a.cpp">

+		</File>

+		<File

+			RelativePath="scumm\player_v3a.h">

+		</File>

+		<File

+			RelativePath="scumm\resource.cpp">

+		</File>

+		<File

+			RelativePath="scumm\resource.h">

+		</File>

+		<File

+			RelativePath="scumm\resource_v2.cpp">

+		</File>

+		<File

+			RelativePath="scumm\resource_v3.cpp">

+		</File>

+		<File

+			RelativePath="scumm\resource_v4.cpp">

+		</File>

+		<File

+			RelativePath="scumm\saveload.cpp">

+		</File>

+		<File

+			RelativePath="scumm\saveload.h">

+		</File>

+		<File

+			RelativePath="scumm\script.cpp">

+		</File>

+		<File

+			RelativePath="scumm\script.h">

+		</File>

+		<File

+			RelativePath="scumm\script_v2.cpp">

+		</File>

+		<File

+			RelativePath="scumm\script_v5.cpp">

+		</File>

+		<File

+			RelativePath="scumm\script_v6.cpp">

+		</File>

+		<File

+			RelativePath="scumm\script_v8.cpp">

+		</File>

+		<File

+			RelativePath="scumm\scumm.h">

+		</File>

+		<File

+			RelativePath="scumm\scummvm.cpp">

+		</File>

+		<File

+			RelativePath="scumm\sound.cpp">

+		</File>

+		<File

+			RelativePath="scumm\sound.h">

+		</File>

+		<File

+			RelativePath="scumm\string.cpp">

+		</File>

+		<File

+			RelativePath="scumm\usage_bits.cpp">

+		</File>

+		<File

+			RelativePath="scumm\usage_bits.h">

+		</File>

+		<File

+			RelativePath="scumm\vars.cpp">

+		</File>

+		<File

+			RelativePath="scumm\verbs.cpp">

+		</File>

+		<File

+			RelativePath="scumm\verbs.h">

+		</File>

 	</Files>

 	<Globals>

 	</Globals>


Index: scummvm.sln
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.sln,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scummvm.sln	25 Aug 2003 19:36:26 -0000	1.3
+++ scummvm.sln	2 Oct 2003 20:22:45 -0000	1.4
@@ -1,68 +1,48 @@
 Microsoft Visual Studio Solution File, Format Version 7.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{7FCD00C2-877C-4241-813E-4A94A7080704}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs2", "bs2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{0778E133-09E2-4E28-8749-C111C22BA676}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bs2", "bs2.vcproj", "{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"

 EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		ConfigName.0 = Debug

-		ConfigName.1 = mad mp3 Debug

-		ConfigName.2 = mad mp3 Release

-		ConfigName.3 = Release

+		ConfigName.1 = Release

 	EndGlobalSection

 	GlobalSection(ProjectDependencies) = postSolution

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.0 = {3CA1F426-FC3E-44DC-A66C-3451134C6B7B}

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.1 = {606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.2 = {D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.3 = {0778E133-09E2-4E28-8749-C111C22BA676}

 	EndGlobalSection

 	GlobalSection(ProjectConfiguration) = postSolution

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.Debug.ActiveCfg = Debug|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.Debug.Build.0 = Debug|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.mad mp3 Debug.ActiveCfg = mad mp3 Debug|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.mad mp3 Debug.Build.0 = mad mp3 Debug|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.mad mp3 Release.ActiveCfg = mad mp3 Release|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.mad mp3 Release.Build.0 = mad mp3 Release|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.Release.ActiveCfg = Release|Win32

-		{7FCD00C2-877C-4241-813E-4A94A7080704}.Release.Build.0 = Release|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.Debug.ActiveCfg = Debug|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.Debug.Build.0 = Debug|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.mad mp3 Debug.ActiveCfg = mad mp3 Debug|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.mad mp3 Debug.Build.0 = mad mp3 Debug|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.mad mp3 Release.ActiveCfg = mad mp3 Release|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.mad mp3 Release.Build.0 = mad mp3 Release|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.Release.ActiveCfg = Release|Win32

-		{D806EE7B-5B77-4B88-B9CB-E02DF8A3191E}.Release.Build.0 = Release|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.Debug.ActiveCfg = Debug|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.Debug.Build.0 = Debug|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.mad mp3 Debug.ActiveCfg = mad mp3 Debug|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.mad mp3 Debug.Build.0 = mad mp3 Debug|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.mad mp3 Release.ActiveCfg = mad mp3 Release|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.mad mp3 Release.Build.0 = mad mp3 Release|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.Release.ActiveCfg = Release|Win32

-		{0778E133-09E2-4E28-8749-C111C22BA676}.Release.Build.0 = Release|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.Debug.ActiveCfg = Debug|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.Debug.Build.0 = Debug|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.mad mp3 Debug.ActiveCfg = mad mp3 Debug|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.mad mp3 Debug.Build.0 = mad mp3 Debug|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.mad mp3 Release.ActiveCfg = mad mp3 Release|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.mad mp3 Release.Build.0 = mad mp3 Release|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.Release.ActiveCfg = Release|Win32

-		{3CA1F426-FC3E-44DC-A66C-3451134C6B7B}.Release.Build.0 = Release|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.Debug.ActiveCfg = Debug|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.Debug.Build.0 = Debug|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.mad mp3 Debug.ActiveCfg = mad mp3 Debug|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.mad mp3 Debug.Build.0 = mad mp3 Debug|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.mad mp3 Release.ActiveCfg = mad mp3 Release|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.mad mp3 Release.Build.0 = mad mp3 Release|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.Release.ActiveCfg = Release|Win32

-		{606ED0B4-C3B1-4C89-859E-29C9C1FA4E76}.Release.Build.0 = Release|Win32

+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32

+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.Build.0 = Debug|Win32

+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release.ActiveCfg = Release|Win32

+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Release.Build.0 = Release|Win32

+		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug.ActiveCfg = Debug|Win32

+		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Debug.Build.0 = Debug|Win32

+		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release.ActiveCfg = Release|Win32

+		{6CC3E421-779D-4E80-8100-520886A0F9FF}.Release.Build.0 = Release|Win32

+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug.ActiveCfg = Debug|Win32

+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Debug.Build.0 = Debug|Win32

+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release.ActiveCfg = Release|Win32

+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}.Release.Build.0 = Release|Win32

+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug.ActiveCfg = Debug|Win32

+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Debug.Build.0 = Debug|Win32

+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release.ActiveCfg = Release|Win32

+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF}.Release.Build.0 = Release|Win32

+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug.ActiveCfg = Debug|Win32

+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Debug.Build.0 = Debug|Win32

+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release.ActiveCfg = Release|Win32

+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}.Release.Build.0 = Release|Win32

+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug.ActiveCfg = Debug|Win32

+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Debug.Build.0 = Debug|Win32

+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release.ActiveCfg = Release|Win32

+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection


Index: scummvm.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- scummvm.vcproj	18 Sep 2003 18:04:06 -0000	1.13
+++ scummvm.vcproj	2 Oct 2003 20:22:46 -0000	1.14
@@ -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"

-			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"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				PrecompiledHeaderFile=".\scummvm___Release/scummvm.pch"

-				AssemblerListingLocation=".\scummvm___Release/"

-				ObjectFile=".\scummvm___Release/"

-				ProgramDataBaseFileName=".\scummvm___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 simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib"

-				OutputFile=".\scummvm___Release/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"

+			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,USE_MAD"

+				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___mad_mp3_Release/scummvm.pch"

-				AssemblerListingLocation=".\scummvm___mad_mp3_Release/"

-				ObjectFile=".\scummvm___mad_mp3_Release/"

-				ProgramDataBaseFileName=".\scummvm___mad_mp3_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 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"

+				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,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"/>

-			<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"/>

+				GenerateDebugInformation="FALSE"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="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">

-				</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">

+					RelativePath="backends\sdl\sdl-common.cpp">

 				</File>

 				<File

-					RelativePath="sound\voc.cpp">

+					RelativePath="backends\sdl\sdl-common.h">

 				</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">

-				</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">

+					RelativePath="backends\fs\fs.h">

 				</File>

 				<File

-					RelativePath=".\gui\widget.h">

+					RelativePath="backends\fs\windows\windows-fs.cpp">

 				</File>

 			</Filter>

 			<Filter

-				Name="backends"

-				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"

+				Name="midi"

 				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">

+					RelativePath="backends\midi\adlib.cpp">

 				</File>

 				<File

-					RelativePath="base\plugins.cpp">

+					RelativePath="backends\midi\null.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>


Index: simon.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- simon.vcproj	25 Aug 2003 19:36:26 -0000	1.4
+++ simon.vcproj	2 Oct 2003 20:22:46 -0000	1.5
@@ -3,139 +3,41 @@
 	ProjectType="Visual C++"

 	Version="7.00"

 	Name="simon"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"

+	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

 	</Platforms>

 	<Configurations>

 		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\simon___Release"

-			IntermediateDirectory=".\simon___Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\simon___Release/simon.pch"

-				AssemblerListingLocation=".\simon___Release/"

-				ObjectFile=".\simon___Release/"

-				ProgramDataBaseFileName=".\simon___Release/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\simon___Release\simon.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="mad mp3 Debug|Win32"

-			OutputDirectory=".\simon___mad_mp3_Debug"

-			IntermediateDirectory=".\simon___mad_mp3_Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				PrecompiledHeaderFile=".\simon___mad_mp3_Debug/simon.pch"

-				AssemblerListingLocation=".\simon___mad_mp3_Debug/"

-				ObjectFile=".\simon___mad_mp3_Debug/"

-				ProgramDataBaseFileName=".\simon___mad_mp3_Debug/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\simon___mad_mp3_Debug\simon.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\simon___Debug"

-			IntermediateDirectory=".\simon___Debug"

+			OutputDirectory="vc7_out/simon_Debug"

+			IntermediateDirectory="vc7_out/simon_Debug"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

 			CharacterSet="2">

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"

+				MinimalRebuild="TRUE"

+				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\simon___Debug/simon.pch"

-				AssemblerListingLocation=".\simon___Debug/"

-				ObjectFile=".\simon___Debug/"

-				ProgramDataBaseFileName=".\simon___Debug/"

+				BufferSecurityCheck="TRUE"

+				EnableFunctionLevelLinking="TRUE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

+				SuppressStartupBanner="FALSE"

+				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\simon___Debug\simon.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/simon.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -145,45 +47,40 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 		<Configuration

-			Name="mad mp3 Release|Win32"

-			OutputDirectory=".\simon___mad_mp3_Release"

-			IntermediateDirectory=".\simon___mad_mp3_Release"

+			Name="Release|Win32"

+			OutputDirectory="vc7_out/simon_Release"

+			IntermediateDirectory="vc7_out/simon_Release"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			ATLMinimizesCRunTimeLibraryUsage="TRUE"

+			CharacterSet="2"

+			WholeProgramOptimization="TRUE">

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

 				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"

+				OmitFramePointers="TRUE"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"

 				StringPooling="TRUE"

+				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\simon___mad_mp3_Release/simon.pch"

-				AssemblerListingLocation=".\simon___mad_mp3_Release/"

-				ObjectFile=".\simon___mad_mp3_Release/"

-				ProgramDataBaseFileName=".\simon___mad_mp3_Release/"

+				BufferSecurityCheck="FALSE"

+				EnableFunctionLevelLinking="FALSE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				DebugInformationFormat="0"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\simon___mad_mp3_Release\simon.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/simon.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -193,66 +90,60 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 	</Configurations>

 	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath=".\simon\charset.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\debug.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\debug.h">

-			</File>

-			<File

-				RelativePath=".\simon\intern.h">

-			</File>

-			<File

-				RelativePath=".\simon\items.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\midi.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\midi.h">

-			</File>

-			<File

-				RelativePath=".\simon\midiparser_s1d.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\res.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\simon.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\simon.h">

-			</File>

-			<File

-				RelativePath=".\simon\sound.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\sound.h">

-			</File>

-			<File

-				RelativePath=".\simon\verb.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\vga.cpp">

-			</File>

-			<File

-				RelativePath=".\simon\vga.h">

-			</File>

-		</Filter>

+		<File

+			RelativePath="simon\charset.cpp">

+		</File>

+		<File

+			RelativePath="simon\debug.cpp">

+		</File>

+		<File

+			RelativePath="simon\debug.h">

+		</File>

+		<File

+			RelativePath="simon\intern.h">

+		</File>

+		<File

+			RelativePath="simon\items.cpp">

+		</File>

+		<File

+			RelativePath="simon\midi.cpp">

+		</File>

+		<File

+			RelativePath="simon\midi.h">

+		</File>

+		<File

+			RelativePath="simon\midiparser_s1d.cpp">

+		</File>

+		<File

+			RelativePath="simon\res.cpp">

+		</File>

+		<File

+			RelativePath="simon\simon.cpp">

+		</File>

+		<File

+			RelativePath="simon\simon.h">

+		</File>

+		<File

+			RelativePath="simon\sound.cpp">

+		</File>

+		<File

+			RelativePath="simon\sound.h">

+		</File>

+		<File

+			RelativePath="simon\verb.cpp">

+		</File>

+		<File

+			RelativePath="simon\vga.cpp">

+		</File>

+		<File

+			RelativePath="simon\vga.h">

+		</File>

 	</Files>

 	<Globals>

 	</Globals>


Index: sky.vcproj
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sky.vcproj	25 Aug 2003 19:36:26 -0000	1.5
+++ sky.vcproj	2 Oct 2003 20:22:46 -0000	1.6
@@ -3,140 +3,41 @@
 	ProjectType="Visual C++"

 	Version="7.00"

 	Name="sky"

-	SccProjectName=""

-	SccLocalPath="">

+	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"

+	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

 			Name="Win32"/>

 	</Platforms>

 	<Configurations>

 		<Configuration

-			Name="mad mp3 Release|Win32"

-			OutputDirectory=".\sky___mad_mp3_Release"

-			IntermediateDirectory=".\sky___mad_mp3_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\sky___mad_mp3_Release/sky.pch"

-				AssemblerListingLocation=".\sky___mad_mp3_Release/"

-				ObjectFile=".\sky___mad_mp3_Release/"

-				ProgramDataBaseFileName=".\sky___mad_mp3_Release/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\sky___mad_mp3_Release\sky.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory=".\sky___Debug"

-			IntermediateDirectory=".\sky___Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\sky___Debug/sky.pch"

-				AssemblerListingLocation=".\sky___Debug/"

-				ObjectFile=".\sky___Debug/"

-				ProgramDataBaseFileName=".\sky___Debug/"

-				WarningLevel="3"

-				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile=".\sky___Debug\sky.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="mad mp3 Debug|Win32"

-			OutputDirectory=".\sky___mad_mp3_Debug"

-			IntermediateDirectory=".\sky___mad_mp3_Debug"

+			OutputDirectory="vc7_out/sky_Debug"

+			IntermediateDirectory="vc7_out/sky_Debug"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

 			CharacterSet="2">

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"

+				MinimalRebuild="TRUE"

+				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\sky___mad_mp3_Debug/sky.pch"

-				AssemblerListingLocation=".\sky___mad_mp3_Debug/"

-				ObjectFile=".\sky___mad_mp3_Debug/"

-				ProgramDataBaseFileName=".\sky___mad_mp3_Debug/"

+				BufferSecurityCheck="TRUE"

+				EnableFunctionLevelLinking="TRUE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

+				SuppressStartupBanner="FALSE"

+				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\sky___mad_mp3_Debug\sky.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/sky.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -146,45 +47,40 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory=".\sky___Release"

-			IntermediateDirectory=".\sky___Release"

+			OutputDirectory="vc7_out/sky_Release"

+			IntermediateDirectory="vc7_out/sky_Release"

 			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

+			CharacterSet="2"

+			WholeProgramOptimization="TRUE">

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

 				InlineFunctionExpansion="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories=".,common"

-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"

+				OmitFramePointers="TRUE"

+				AdditionalIncludeDirectories="."

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"

 				StringPooling="TRUE"

+				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\sky___Release/sky.pch"

-				AssemblerListingLocation=".\sky___Release/"

-				ObjectFile=".\sky___Release/"

-				ProgramDataBaseFileName=".\sky___Release/"

+				BufferSecurityCheck="FALSE"

+				EnableFunctionLevelLinking="FALSE"

+				DisableLanguageExtensions="FALSE"

+				ForceConformanceInForLoopScope="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				WarnAsError="TRUE"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

+				DebugInformationFormat="0"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile=".\sky___Release\sky.lib"

-				SuppressStartupBanner="TRUE"/>

+				OutputFile="$(OutDir)/sky.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -194,389 +90,383 @@
 			<Tool

 				Name="VCPreLinkEventTool"/>

 			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1045"/>

+				Name="VCResourceCompilerTool"/>

 			<Tool

 				Name="VCWebServiceProxyGeneratorTool"/>

 		</Configuration>

 	</Configurations>

 	<Files>

 		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			Name="music"

+			Filter="">

 			<File

-				RelativePath=".\sky\autoroute.cpp">

+				RelativePath="sky\music\adlibchannel.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\autoroute.h">

+				RelativePath="sky\music\adlibchannel.h">

 			</File>

 			<File

-				RelativePath=".\sky\compact.cpp">

+				RelativePath="sky\music\adlibmusic.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\compact.h">

+				RelativePath="sky\music\adlibmusic.h">

 			</File>

 			<File

-				RelativePath=".\sky\control.cpp">

+				RelativePath="sky\music\gmchannel.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\control.h">

+				RelativePath="sky\music\gmchannel.h">

 			</File>

 			<File

-				RelativePath=".\sky\debug.cpp">

+				RelativePath="sky\music\gmmusic.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\debug.h">

+				RelativePath="sky\music\gmmusic.h">

 			</File>

 			<File

-				RelativePath=".\sky\disk.cpp">

+				RelativePath="sky\music\mt32music.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\disk.h">

+				RelativePath="sky\music\mt32music.h">

 			</File>

 			<File

-				RelativePath=".\sky\grid.cpp">

+				RelativePath="sky\music\musicbase.cpp">

 			</File>

 			<File

-				RelativePath=".\sky\grid.h">

+				RelativePath="sky\music\musicbase.h">

 			</File>

+		</Filter>

+		<Filter

+			Name="compacts"

+			Filter="">

 			<File

-				RelativePath=".\sky\hufftext.cpp">

+				RelativePath="sky\compacts\0compact.h">

 			</File>

 			<File

-				RelativePath=".\sky\intro.cpp">

+				RelativePath="sky\compacts\101comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\intro.h">

+				RelativePath="sky\compacts\102comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\logic.cpp">

+				RelativePath="sky\compacts\10comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\logic.h">

+				RelativePath="sky\compacts\11comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\mouse.cpp">

+				RelativePath="sky\compacts\12comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\mouse.h">

+				RelativePath="sky\compacts\13comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\rnc_deco.cpp">

+				RelativePath="sky\compacts\14comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\rnc_deco.h">

+				RelativePath="sky\compacts\15comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\screen.cpp">

+				RelativePath="sky\compacts\16comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\screen.h">

+				RelativePath="sky\compacts\17comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\sky.cpp">

+				RelativePath="sky\compacts\18comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\sky.h">

+				RelativePath="sky\compacts\19comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\skydefs.h">

+				RelativePath="sky\compacts\1compact.h">

 			</File>

 			<File

-				RelativePath=".\sky\sound.cpp">

+				RelativePath="sky\compacts\20comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\sound.h">

+				RelativePath="sky\compacts\21comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\struc.h">

+				RelativePath="sky\compacts\22comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\talks.h">

+				RelativePath="sky\compacts\23comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\text.cpp">

+				RelativePath="sky\compacts\24comp.h">

 			</File>

 			<File

-				RelativePath=".\sky\text.h">

+				RelativePath="sky\compacts\25comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\26comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\27comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\28comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\29comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\2compact.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\30comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\31comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\32comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\33comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\34comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\36comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\37comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\38comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\39comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\3compact.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\40comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\41comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\42comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\44comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\45comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\46comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\47comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\48comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\4compact.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\5compact.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\65comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\66comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\67comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\68comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\69comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\70comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\71comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\72comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\73comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\74comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\75comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\76comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\77comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\78comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\79comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\80comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\81comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\82comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\85comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\90comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\91comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\92comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\93comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\94comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\95comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\96comp.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\9compact.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\linc_gen.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\lincmenu.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\objects.h">

+			</File>

+			<File

+				RelativePath="sky\compacts\savedata.cpp">

+			</File>

+			<File

+				RelativePath="sky\compacts\z_compac.h">

 			</File>

-			<Filter

-				Name="compacts"

-				Filter="">

-				<File

-					RelativePath=".\sky\compacts\0compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\101comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\102comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\10comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\11comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\12comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\13comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\14comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\15comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\16comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\17comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\18comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\19comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\1compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\20comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\21comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\22comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\23comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\24comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\25comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\26comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\27comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\28comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\29comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\2compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\30comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\31comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\32comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\33comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\34comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\36comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\37comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\38comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\39comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\3compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\40comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\41comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\42comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\44comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\45comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\46comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\47comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\48comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\4compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\5compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\65comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\66comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\67comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\68comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\69comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\70comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\71comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\72comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\73comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\74comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\75comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\76comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\77comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\78comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\79comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\80comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\81comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\82comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\85comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\90comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\91comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\92comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\93comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\94comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\95comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\96comp.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\9compact.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\linc_gen.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\lincmenu.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\objects.h">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\savedata.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\compacts\z_compac.h">

-				</File>

-			</Filter>

-			<Filter

-				Name="music"

-				Filter="">

-				<File

-					RelativePath=".\sky\music\adlibchannel.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\adlibchannel.h">

-				</File>

-				<File

-					RelativePath=".\sky\music\adlibmusic.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\adlibmusic.h">

-				</File>

-				<File

-					RelativePath=".\sky\music\gmchannel.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\gmchannel.h">

-				</File>

-				<File

-					RelativePath=".\sky\music\gmmusic.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\gmmusic.h">

-				</File>

-				<File

-					RelativePath=".\sky\music\mt32music.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\mt32music.h">

-				</File>

-				<File

-					RelativePath=".\sky\music\musicbase.cpp">

-				</File>

-				<File

-					RelativePath=".\sky\music\musicbase.h">

-				</File>

-			</Filter>

 		</Filter>

+		<File

+			RelativePath="sky\autoroute.cpp">

+		</File>

+		<File

+			RelativePath="sky\autoroute.h">

+		</File>

+		<File

+			RelativePath="sky\compact.cpp">

+		</File>

+		<File

+			RelativePath="sky\compact.h">

+		</File>

+		<File

+			RelativePath="sky\control.cpp">

+		</File>

+		<File

+			RelativePath="sky\control.h">

+		</File>

+		<File

+			RelativePath="sky\debug.cpp">

+		</File>

+		<File

+			RelativePath="sky\debug.h">

+		</File>

+		<File

+			RelativePath="sky\disk.cpp">

+		</File>

+		<File

+			RelativePath="sky\disk.h">

+		</File>

+		<File

+			RelativePath="sky\grid.cpp">

+		</File>

+		<File

+			RelativePath="sky\grid.h">

+		</File>

+		<File

+			RelativePath="sky\hufftext.cpp">

+		</File>

+		<File

+			RelativePath="sky\intro.cpp">

+		</File>

+		<File

+			RelativePath="sky\intro.h">

+		</File>

+		<File

+			RelativePath="sky\logic.cpp">

+		</File>

+		<File

+			RelativePath="sky\logic.h">

+		</File>

+		<File

+			RelativePath="sky\mouse.cpp">

+		</File>

+		<File

+			RelativePath="sky\mouse.h">

+		</File>

+		<File

+			RelativePath="sky\rnc_deco.cpp">

+		</File>

+		<File

+			RelativePath="sky\rnc_deco.h">

+		</File>

+		<File

+			RelativePath="sky\screen.cpp">

+		</File>

+		<File

+			RelativePath="sky\screen.h">

+		</File>

+		<File

+			RelativePath="sky\sky.cpp">

+		</File>

+		<File

+			RelativePath="sky\sky.h">

+		</File>

+		<File

+			RelativePath="sky\skydefs.h">

+		</File>

+		<File

+			RelativePath="sky\sound.cpp">

+		</File>

+		<File

+			RelativePath="sky\sound.h">

+		</File>

+		<File

+			RelativePath="sky\struc.h">

+		</File>

+		<File

+			RelativePath="sky\talks.h">

+		</File>

+		<File

+			RelativePath="sky\text.cpp">

+		</File>

+		<File

+			RelativePath="sky\text.h">

+		</File>

 	</Files>

 	<Globals>

 	</Globals>






More information about the Scummvm-git-logs mailing list