[Scummvm-cvs-logs] SF.net SVN: scummvm:[42318] scummvm/branches/gsoc2009-16bit

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jul 10 02:07:27 CEST 2009


Revision: 42318
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42318&view=rev
Author:   Kirben
Date:     2009-07-10 00:07:26 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Merged revisions 42277-42278,42286-42290,42292-42293,42297,42300-42301,42303,42305-42306 via svnmerge from 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42277 | drmccoy | 2009-07-09 12:54:10 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Giving Font its own real class
........
  r42278 | dreammaster | 2009-07-09 13:07:30 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Changed the status of the cruise engine to be enabled by default
........
  r42286 | drmccoy | 2009-07-09 19:39:51 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Warn instead of crash when a video frame part was found although the header says there's no video
........
  r42287 | thebluegr | 2009-07-09 23:17:46 +1000 (Thu, 09 Jul 2009) | 1 line
  
  Renamed sound/iff.* to sound/iff_sound.* to fix an issue with the upcoming changes to the MSVC project files (sound/iff.* produces iff.obj, which clashes with iff.obj from graphics/iff.*)
........
  r42288 | thebluegr | 2009-07-10 01:12:35 +1000 (Fri, 10 Jul 2009) | 3 lines
  
  - Rewrote and greatly simplified the MSVC8 and MSVC9 project files so that they use common compilation properties, based on patch #2774908. These common properties make it much simpler to change options and compilation defines globally, similar to how GCC *.mk files do. Also, this fixes problems where an ENABLE_* define was set for one project file but not another (like the situation in revisions 42257 and 42259). It's now much easier to construct a tool which will create the project files dynamically.
  - Dropped support for MSVC7 and MSVC7.1 for now (as they don't support common compilation properties and it's no longer easy to construct them from the MSVC8 ones) - hopefully, they will return in the future, once we got a more sophisticated tool to create them
  - Simplified the MSVC9 <-> MSVC8 conversion tools a bit
........
  r42289 | thebluegr | 2009-07-10 01:15:49 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Reverted commit #42257, as the original issue was with the compilation process of MSVC and the ENABLE_* checks work correctly
........
  r42290 | thebluegr | 2009-07-10 01:17:45 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Added proper safeguards for shorten.*, thereby fixing commit 42259
........
  r42292 | lordhoto | 2009-07-10 01:32:06 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Cleanup.
........
  r42293 | lordhoto | 2009-07-10 01:32:25 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Cleanup rollDice (the results of the old and the new function are almost identical).
........
  r42297 | thebluegr | 2009-07-10 01:46:26 +1000 (Fri, 10 Jul 2009) | 1 line
  
  restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260)
........
  r42300 | thebluegr | 2009-07-10 01:54:18 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes
........
  r42301 | lordhoto | 2009-07-10 01:59:20 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Fix wrong format arugment.
........
  r42303 | lordhoto | 2009-07-10 02:16:08 +1000 (Fri, 10 Jul 2009) | 1 line
  
  By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it.
........
  r42305 | lordhoto | 2009-07-10 02:23:22 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Add fixme about SCI32 specific code.
........
  r42306 | lordhoto | 2009-07-10 02:24:59 +1000 (Fri, 10 Jul 2009) | 1 line
  
  Oops specify the correct revsision number in the fixme.
........

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/configure
    scummvm/branches/gsoc2009-16bit/dists/msvc8/agi.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/agos.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/cine.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/cruise.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/drascula.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/gob.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/groovie.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/igor.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/kyra.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/lure.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/m4.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/made.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/parallaction.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/queen.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/saga.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/sci.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/scumm.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/scummvm.sln
    scummvm/branches/gsoc2009-16bit/dists/msvc8/scummvm.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/sky.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/sword1.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/sword2.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/tinsel.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/touche.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8/tucker.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc8_to_msvc9.bat
    scummvm/branches/gsoc2009-16bit/dists/msvc9/agi.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/agos.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/cine.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/cruise.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/drascula.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/gob.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/groovie.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/igor.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/kyra.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/lure.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/m4.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/made.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/parallaction.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/queen.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/saga.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/sci.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/scumm.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/scummvm.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/sky.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/sword1.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/sword2.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/tinsel.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/touche.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9/tucker.vcproj
    scummvm/branches/gsoc2009-16bit/dists/msvc9_to_msvc8.bat
    scummvm/branches/gsoc2009-16bit/engines/gob/dataio.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/draw.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/draw.h
    scummvm/branches/gsoc2009-16bit/engines/gob/draw_v1.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/draw_v2.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/driver_vga.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/driver_vga.h
    scummvm/branches/gsoc2009-16bit/engines/gob/gob.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/hotspots.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/hotspots.h
    scummvm/branches/gsoc2009-16bit/engines/gob/init.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/inter_v1.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/inter_v5.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/util.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/util.h
    scummvm/branches/gsoc2009-16bit/engines/gob/video.cpp
    scummvm/branches/gsoc2009-16bit/engines/gob/video.h
    scummvm/branches/gsoc2009-16bit/engines/kyra/lol.cpp
    scummvm/branches/gsoc2009-16bit/engines/parallaction/sound.h
    scummvm/branches/gsoc2009-16bit/engines/sci/debug.h
    scummvm/branches/gsoc2009-16bit/engines/sci/detection.cpp
    scummvm/branches/gsoc2009-16bit/engines/sci/engine/state.h
    scummvm/branches/gsoc2009-16bit/engines/sci/resource.cpp
    scummvm/branches/gsoc2009-16bit/graphics/sjis.cpp
    scummvm/branches/gsoc2009-16bit/graphics/sjis.h
    scummvm/branches/gsoc2009-16bit/graphics/video/coktelvideo/coktelvideo.cpp
    scummvm/branches/gsoc2009-16bit/sound/module.mk
    scummvm/branches/gsoc2009-16bit/sound/shorten.cpp
    scummvm/branches/gsoc2009-16bit/sound/shorten.h

Added Paths:
-----------
    scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Debug.vsprops
    scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Global.vsprops
    scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Release.vsprops
    scummvm/branches/gsoc2009-16bit/dists/msvc9/ScummVM_Debug.vsprops
    scummvm/branches/gsoc2009-16bit/dists/msvc9/ScummVM_Global.vsprops
    scummvm/branches/gsoc2009-16bit/dists/msvc9/ScummVM_Release.vsprops
    scummvm/branches/gsoc2009-16bit/sound/iff_sound.cpp
    scummvm/branches/gsoc2009-16bit/sound/iff_sound.h

Removed Paths:
-------------
    scummvm/branches/gsoc2009-16bit/dists/msvc7/
    scummvm/branches/gsoc2009-16bit/dists/msvc71/
    scummvm/branches/gsoc2009-16bit/dists/msvc8_to_msvc7_71.bat
    scummvm/branches/gsoc2009-16bit/sound/iff.cpp
    scummvm/branches/gsoc2009-16bit/sound/iff.h

Property Changed:
----------------
    scummvm/branches/gsoc2009-16bit/


Property changes on: scummvm/branches/gsoc2009-16bit
___________________________________________________________________
Modified: svnmerge-integrated
   - /scummvm/trunk:1-42273 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/branches/gsoc2008-gui:1-31703
   + /scummvm/trunk:1-42317 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/branches/gsoc2008-gui:1-31703

Modified: scummvm/branches/gsoc2009-16bit/configure
===================================================================
--- scummvm/branches/gsoc2009-16bit/configure	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/configure	2009-07-10 00:07:26 UTC (rev 42318)
@@ -73,7 +73,7 @@
 add_engine agos "AGOS" yes "pn"
 add_engine pn "Personal Nightmare" no
 add_engine cine "Cinematique evo 1" yes
-add_engine cruise "Cinematique evo 2" no
+add_engine cruise "Cinematique evo 2" yes
 add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
 add_engine groovie "Groovie" yes

Copied: scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Debug.vsprops (from rev 42306, scummvm/trunk/dists/msvc8/ScummVM_Debug.vsprops)
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Debug.vsprops	                        (rev 0)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Debug.vsprops	2009-07-10 00:07:26 UTC (rev 42318)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Debug32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		PreprocessorDefinitions="WIN32"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		EnableFunctionLevelLinking="true"
+		WarnAsError="false"
+		DebugInformationFormat="4"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="2"
+		GenerateDebugInformation="true"
+		IgnoreDefaultLibraryNames="libcmt.lib"
+	/>
+</VisualStudioPropertySheet>

Copied: scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Global.vsprops (from rev 42306, scummvm/trunk/dists/msvc8/ScummVM_Global.vsprops)
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Global.vsprops	                        (rev 0)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Global.vsprops	2009-07-10 00:07:26 UTC (rev 42318)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Global"
+	OutputDirectory="$(ConfigurationName)"
+	IntermediateDirectory="$(ConfigurationName)/$(ProjectName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
+		AdditionalIncludeDirectories="../..;../../engines"
+		PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
+		ExceptionHandling="0"
+		RuntimeTypeInfo="false"
+		WarningLevel="4"
+		WarnAsError="true"
+		CompileAs="0"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		IgnoreDefaultLibraryNames=""
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		IgnoreDefaultLibraryNames=""
+		SubSystem="1"
+		EntryPointSymbol="WinMainCRTStartup"
+	/>
+</VisualStudioPropertySheet>

Copied: scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Release.vsprops (from rev 42306, scummvm/trunk/dists/msvc8/ScummVM_Release.vsprops)
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Release.vsprops	                        (rev 0)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/ScummVM_Release.vsprops	2009-07-10 00:07:26 UTC (rev 42318)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ScummVM_Release32"
+	InheritedPropertySheets=".\ScummVM_Global.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="1"
+		EnableIntrinsicFunctions="true"
+		WholeProgramOptimization="true"
+		PreprocessorDefinitions="WIN32"
+		StringPooling="true"
+		BufferSecurityCheck="false"
+		DebugInformationFormat="0"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkIncremental="1"
+		IgnoreDefaultLibraryNames=""
+		SetChecksum="true"
+	/>
+</VisualStudioPropertySheet>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/agi.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/agi.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/agi.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,377 +8,65 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agi_Debug"
-			IntermediateDirectory="agi_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agi_Release"
-			IntermediateDirectory="agi_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agi\agi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\checks.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\console.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\cycle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\id.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\inv.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\keyboard.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\loader_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\logic.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\lzw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\motion.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_cmd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_dbg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\op_test.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\opcodes.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\picture.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_common.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_mickey.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_troll.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\preagi_winnie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\predictive.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\sprite.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\view.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\wagparser.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\words.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agi\agi.cpp" />
+		<File RelativePath="..\..\engines\agi\agi.h" />
+		<File RelativePath="..\..\engines\agi\checks.cpp" />
+		<File RelativePath="..\..\engines\agi\console.cpp" />
+		<File RelativePath="..\..\engines\agi\console.h" />
+		<File RelativePath="..\..\engines\agi\cycle.cpp" />
+		<File RelativePath="..\..\engines\agi\detection.cpp" />
+		<File RelativePath="..\..\engines\agi\font.h" />
+		<File RelativePath="..\..\engines\agi\global.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.cpp" />
+		<File RelativePath="..\..\engines\agi\graphics.h" />
+		<File RelativePath="..\..\engines\agi\id.cpp" />
+		<File RelativePath="..\..\engines\agi\inv.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.cpp" />
+		<File RelativePath="..\..\engines\agi\keyboard.h" />
+		<File RelativePath="..\..\engines\agi\loader_v2.cpp" />
+		<File RelativePath="..\..\engines\agi\loader_v3.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.cpp" />
+		<File RelativePath="..\..\engines\agi\logic.h" />
+		<File RelativePath="..\..\engines\agi\lzw.cpp" />
+		<File RelativePath="..\..\engines\agi\lzw.h" />
+		<File RelativePath="..\..\engines\agi\menu.cpp" />
+		<File RelativePath="..\..\engines\agi\menu.h" />
+		<File RelativePath="..\..\engines\agi\motion.cpp" />
+		<File RelativePath="..\..\engines\agi\objects.cpp" />
+		<File RelativePath="..\..\engines\agi\op_cmd.cpp" />
+		<File RelativePath="..\..\engines\agi\op_dbg.cpp" />
+		<File RelativePath="..\..\engines\agi\op_test.cpp" />
+		<File RelativePath="..\..\engines\agi\opcodes.h" />
+		<File RelativePath="..\..\engines\agi\picture.cpp" />
+		<File RelativePath="..\..\engines\agi\picture.h" />
+		<File RelativePath="..\..\engines\agi\preagi.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi.h" />
+		<File RelativePath="..\..\engines\agi\preagi_common.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_common.h" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_mickey.h" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_troll.h" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.cpp" />
+		<File RelativePath="..\..\engines\agi\preagi_winnie.h" />
+		<File RelativePath="..\..\engines\agi\predictive.cpp" />
+		<File RelativePath="..\..\engines\agi\saveload.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.cpp" />
+		<File RelativePath="..\..\engines\agi\sound.h" />
+		<File RelativePath="..\..\engines\agi\sprite.cpp" />
+		<File RelativePath="..\..\engines\agi\sprite.h" />
+		<File RelativePath="..\..\engines\agi\text.cpp" />
+		<File RelativePath="..\..\engines\agi\view.cpp" />
+		<File RelativePath="..\..\engines\agi\view.h" />
+		<File RelativePath="..\..\engines\agi\wagparser.cpp" />
+		<File RelativePath="..\..\engines\agi\wagparser.h" />
+		<File RelativePath="..\..\engines\agi\words.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/agos.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/agos.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/agos.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,393 +8,69 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="agos_Debug"
-			IntermediateDirectory="agos_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="agos_Release"
-			IntermediateDirectory="agos_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/agos.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\agos\agos.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\agos.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\animation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset-fontdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\charset.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\contain.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\detection_tables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\event.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\feeble.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\input.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\items.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\menus.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\midiparser_s1d.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\oracle.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_ami.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\res_snd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_pp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\script_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\string.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\subroutine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\verb.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_e2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ff.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_pn.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_s2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\vga_ww.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\window.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\agos\zones.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\agos\agos.cpp" />
+		<File RelativePath="..\..\engines\agos\agos.h" />
+		<File RelativePath="..\..\engines\agos\animation.cpp" />
+		<File RelativePath="..\..\engines\agos\animation.h" />
+		<File RelativePath="..\..\engines\agos\charset-fontdata.cpp" />
+		<File RelativePath="..\..\engines\agos\charset.cpp" />
+		<File RelativePath="..\..\engines\agos\contain.cpp" />
+		<File RelativePath="..\..\engines\agos\cursor.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.cpp" />
+		<File RelativePath="..\..\engines\agos\debug.h" />
+		<File RelativePath="..\..\engines\agos\debugger.cpp" />
+		<File RelativePath="..\..\engines\agos\debugger.h" />
+		<File RelativePath="..\..\engines\agos\detection.cpp" />
+		<File RelativePath="..\..\engines\agos\detection_tables.h" />
+		<File RelativePath="..\..\engines\agos\draw.cpp" />
+		<File RelativePath="..\..\engines\agos\event.cpp" />
+		<File RelativePath="..\..\engines\agos\feeble.cpp" />
+		<File RelativePath="..\..\engines\agos\gfx.cpp" />
+		<File RelativePath="..\..\engines\agos\icons.cpp" />
+		<File RelativePath="..\..\engines\agos\input.cpp" />
+		<File RelativePath="..\..\engines\agos\intern.h" />
+		<File RelativePath="..\..\engines\agos\items.cpp" />
+		<File RelativePath="..\..\engines\agos\menus.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.cpp" />
+		<File RelativePath="..\..\engines\agos\midi.h" />
+		<File RelativePath="..\..\engines\agos\midiparser_s1d.cpp" />
+		<File RelativePath="..\..\engines\agos\oracle.cpp" />
+		<File RelativePath="..\..\engines\agos\pn.cpp" />
+		<File RelativePath="..\..\engines\agos\res.cpp" />
+		<File RelativePath="..\..\engines\agos\res_ami.cpp" />
+		<File RelativePath="..\..\engines\agos\res_snd.cpp" />
+		<File RelativePath="..\..\engines\agos\rooms.cpp" />
+		<File RelativePath="..\..\engines\agos\saveload.cpp" />
+		<File RelativePath="..\..\engines\agos\script.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\script_pp.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\script_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\script_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.cpp" />
+		<File RelativePath="..\..\engines\agos\sound.h" />
+		<File RelativePath="..\..\engines\agos\string.cpp" />
+		<File RelativePath="..\..\engines\agos\subroutine.cpp" />
+		<File RelativePath="..\..\engines\agos\verb.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.cpp" />
+		<File RelativePath="..\..\engines\agos\vga.h" />
+		<File RelativePath="..\..\engines\agos\vga_e2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ff.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_pn.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s1.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_s2.cpp" />
+		<File RelativePath="..\..\engines\agos\vga_ww.cpp" />
+		<File RelativePath="..\..\engines\agos\window.cpp" />
+		<File RelativePath="..\..\engines\agos\zones.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/cine.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/cine.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/cine.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,317 +8,50 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cine_Debug"
-			IntermediateDirectory="cine_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cine_Release"
-			IntermediateDirectory="cine_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cine.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cine\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\anim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\bg_list.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\cine.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\gfx.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\main_loop.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\msg.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\pal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\part.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\prc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\rel.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_fw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\script_os.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\texte.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\unpack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cine\various.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cine\anim.cpp" />
+		<File RelativePath="..\..\engines\cine\anim.h" />
+		<File RelativePath="..\..\engines\cine\bg.cpp" />
+		<File RelativePath="..\..\engines\cine\bg.h" />
+		<File RelativePath="..\..\engines\cine\bg_list.cpp" />
+		<File RelativePath="..\..\engines\cine\bg_list.h" />
+		<File RelativePath="..\..\engines\cine\cine.cpp" />
+		<File RelativePath="..\..\engines\cine\cine.h" />
+		<File RelativePath="..\..\engines\cine\detection.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.cpp" />
+		<File RelativePath="..\..\engines\cine\gfx.h" />
+		<File RelativePath="..\..\engines\cine\main_loop.cpp" />
+		<File RelativePath="..\..\engines\cine\main_loop.h" />
+		<File RelativePath="..\..\engines\cine\msg.cpp" />
+		<File RelativePath="..\..\engines\cine\msg.h" />
+		<File RelativePath="..\..\engines\cine\object.cpp" />
+		<File RelativePath="..\..\engines\cine\object.h" />
+		<File RelativePath="..\..\engines\cine\pal.cpp" />
+		<File RelativePath="..\..\engines\cine\pal.h" />
+		<File RelativePath="..\..\engines\cine\part.cpp" />
+		<File RelativePath="..\..\engines\cine\part.h" />
+		<File RelativePath="..\..\engines\cine\prc.cpp" />
+		<File RelativePath="..\..\engines\cine\prc.h" />
+		<File RelativePath="..\..\engines\cine\rel.cpp" />
+		<File RelativePath="..\..\engines\cine\rel.h" />
+		<File RelativePath="..\..\engines\cine\saveload.cpp" />
+		<File RelativePath="..\..\engines\cine\saveload.h" />
+		<File RelativePath="..\..\engines\cine\script.h" />
+		<File RelativePath="..\..\engines\cine\script_fw.cpp" />
+		<File RelativePath="..\..\engines\cine\script_os.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.cpp" />
+		<File RelativePath="..\..\engines\cine\sound.h" />
+		<File RelativePath="..\..\engines\cine\texte.cpp" />
+		<File RelativePath="..\..\engines\cine\texte.h" />
+		<File RelativePath="..\..\engines\cine\unpack.cpp" />
+		<File RelativePath="..\..\engines\cine\unpack.h" />
+		<File RelativePath="..\..\engines\cine\various.cpp" />
+		<File RelativePath="..\..\engines\cine\various.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/cruise.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/cruise.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/cruise.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,397 +8,70 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="cruise_Debug"
-			IntermediateDirectory="cruise_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="cruise_Release"
-			IntermediateDirectory="cruise_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/cruise.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\cruise\actor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\actor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\background.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\backgroundIncrust.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\cruise_main.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\ctp.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\dataLoader.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\delphine-unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\function.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\gfxModule.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\linker.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mainDraw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\menu.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\mouse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\object.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\overlay.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\perso.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\polys.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\sound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\staticres.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\various.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\vars.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\volume.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\cruise\actor.cpp" />
+		<File RelativePath="..\..\engines\cruise\actor.h" />
+		<File RelativePath="..\..\engines\cruise\background.cpp" />
+		<File RelativePath="..\..\engines\cruise\background.h" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.cpp" />
+		<File RelativePath="..\..\engines\cruise\backgroundIncrust.h" />
+		<File RelativePath="..\..\engines\cruise\cell.cpp" />
+		<File RelativePath="..\..\engines\cruise\cell.h" />
+		<File RelativePath="..\..\engines\cruise\cruise.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise.h" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.cpp" />
+		<File RelativePath="..\..\engines\cruise\cruise_main.h" />
+		<File RelativePath="..\..\engines\cruise\ctp.cpp" />
+		<File RelativePath="..\..\engines\cruise\ctp.h" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.cpp" />
+		<File RelativePath="..\..\engines\cruise\dataLoader.h" />
+		<File RelativePath="..\..\engines\cruise\debugger.cpp" />
+		<File RelativePath="..\..\engines\cruise\debugger.h" />
+		<File RelativePath="..\..\engines\cruise\delphine-unpack.cpp" />
+		<File RelativePath="..\..\engines\cruise\detection.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.cpp" />
+		<File RelativePath="..\..\engines\cruise\font.h" />
+		<File RelativePath="..\..\engines\cruise\function.cpp" />
+		<File RelativePath="..\..\engines\cruise\function.h" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.cpp" />
+		<File RelativePath="..\..\engines\cruise\gfxModule.h" />
+		<File RelativePath="..\..\engines\cruise\linker.cpp" />
+		<File RelativePath="..\..\engines\cruise\linker.h" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.cpp" />
+		<File RelativePath="..\..\engines\cruise\mainDraw.h" />
+		<File RelativePath="..\..\engines\cruise\menu.cpp" />
+		<File RelativePath="..\..\engines\cruise\menu.h" />
+		<File RelativePath="..\..\engines\cruise\mouse.cpp" />
+		<File RelativePath="..\..\engines\cruise\mouse.h" />
+		<File RelativePath="..\..\engines\cruise\object.cpp" />
+		<File RelativePath="..\..\engines\cruise\object.h" />
+		<File RelativePath="..\..\engines\cruise\overlay.cpp" />
+		<File RelativePath="..\..\engines\cruise\overlay.h" />
+		<File RelativePath="..\..\engines\cruise\perso.cpp" />
+		<File RelativePath="..\..\engines\cruise\perso.h" />
+		<File RelativePath="..\..\engines\cruise\polys.cpp" />
+		<File RelativePath="..\..\engines\cruise\polys.h" />
+		<File RelativePath="..\..\engines\cruise\saveload.cpp" />
+		<File RelativePath="..\..\engines\cruise\saveload.h" />
+		<File RelativePath="..\..\engines\cruise\script.cpp" />
+		<File RelativePath="..\..\engines\cruise\script.h" />
+		<File RelativePath="..\..\engines\cruise\sound.cpp" />
+		<File RelativePath="..\..\engines\cruise\sound.h" />
+		<File RelativePath="..\..\engines\cruise\stack.cpp" />
+		<File RelativePath="..\..\engines\cruise\stack.h" />
+		<File RelativePath="..\..\engines\cruise\staticres.cpp" />
+		<File RelativePath="..\..\engines\cruise\staticres.h" />
+		<File RelativePath="..\..\engines\cruise\various.cpp" />
+		<File RelativePath="..\..\engines\cruise\various.h" />
+		<File RelativePath="..\..\engines\cruise\vars.cpp" />
+		<File RelativePath="..\..\engines\cruise\vars.h" />
+		<File RelativePath="..\..\engines\cruise\volume.cpp" />
+		<File RelativePath="..\..\engines\cruise\volume.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/drascula.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/drascula.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/drascula.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,221 +8,26 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="drascula_Debug"
-			IntermediateDirectory="drascula_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="drascula_Release"
-			IntermediateDirectory="drascula_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/drascula.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\drascula\actors.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\animation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\converse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\drascula.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\objects.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\palette.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\rooms.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\sound.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\drascula\actors.cpp" />
+		<File RelativePath="..\..\engines\drascula\animation.cpp" />
+		<File RelativePath="..\..\engines\drascula\converse.cpp" />
+		<File RelativePath="..\..\engines\drascula\detection.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.cpp" />
+		<File RelativePath="..\..\engines\drascula\drascula.h" />
+		<File RelativePath="..\..\engines\drascula\graphics.cpp" />
+		<File RelativePath="..\..\engines\drascula\interface.cpp" />
+		<File RelativePath="..\..\engines\drascula\objects.cpp" />
+		<File RelativePath="..\..\engines\drascula\palette.cpp" />
+		<File RelativePath="..\..\engines\drascula\rooms.cpp" />
+		<File RelativePath="..\..\engines\drascula\saveload.cpp" />
+		<File RelativePath="..\..\engines\drascula\sound.cpp" />
+		<File RelativePath="..\..\engines\drascula\talk.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/gob.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/gob.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/gob.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,645 +8,133 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="gob_Debug"
-			IntermediateDirectory="gob_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_RGB_COLOR"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="gob_Release"
-			IntermediateDirectory="gob_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gob.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="sound"
-			>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\adlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\bgatmosphere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\cdrom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\infogrames.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\pcspeaker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\protracker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundblaster.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\sounddesc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\sound\soundmixer.h"
-				>
-			</File>
+		<Filter Name="sound">
+			<File RelativePath="..\..\engines\gob\sound\adlib.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\adlib.h" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\bgatmosphere.h" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\cdrom.h" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\infogrames.h" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\pcspeaker.h" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\protracker.h" />
+			<File RelativePath="..\..\engines\gob\sound\sound.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sound.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundblaster.h" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\sounddesc.h" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.cpp" />
+			<File RelativePath="..\..\engines\gob\sound\soundmixer.h" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\batplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\dataio.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\demoplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\draw_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\driver_vga.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\expression.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\game.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\global.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\gob.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\goblin_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\helper.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\hotspots.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\init_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_bargon.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_fascin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\inter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\map_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\mult_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\palanim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\resources.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savefile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\savehandler.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v3.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v4.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\demos\scnplayer.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\totfile.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\variables.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\video_v6.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\videoplayer.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\gob\demos\batplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\batplayer.h" />
+		<File RelativePath="..\..\engines\gob\dataio.cpp" />
+		<File RelativePath="..\..\engines\gob\dataio.h" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\demoplayer.h" />
+		<File RelativePath="..\..\engines\gob\detection.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.cpp" />
+		<File RelativePath="..\..\engines\gob\draw.h" />
+		<File RelativePath="..\..\engines\gob\draw_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\draw_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.cpp" />
+		<File RelativePath="..\..\engines\gob\driver_vga.h" />
+		<File RelativePath="..\..\engines\gob\expression.cpp" />
+		<File RelativePath="..\..\engines\gob\expression.h" />
+		<File RelativePath="..\..\engines\gob\game.cpp" />
+		<File RelativePath="..\..\engines\gob\game.h" />
+		<File RelativePath="..\..\engines\gob\global.cpp" />
+		<File RelativePath="..\..\engines\gob\global.h" />
+		<File RelativePath="..\..\engines\gob\gob.cpp" />
+		<File RelativePath="..\..\engines\gob\gob.h" />
+		<File RelativePath="..\..\engines\gob\goblin.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin.h" />
+		<File RelativePath="..\..\engines\gob\goblin_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\goblin_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\helper.h" />
+		<File RelativePath="..\..\engines\gob\hotspots.cpp" />
+		<File RelativePath="..\..\engines\gob\hotspots.h" />
+		<File RelativePath="..\..\engines\gob\init.cpp" />
+		<File RelativePath="..\..\engines\gob\init.h" />
+		<File RelativePath="..\..\engines\gob\init_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\init_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.cpp" />
+		<File RelativePath="..\..\engines\gob\inter.h" />
+		<File RelativePath="..\..\engines\gob\inter_bargon.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_fascin.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v5.cpp" />
+		<File RelativePath="..\..\engines\gob\inter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\map.cpp" />
+		<File RelativePath="..\..\engines\gob\map.h" />
+		<File RelativePath="..\..\engines\gob\map_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\map_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.cpp" />
+		<File RelativePath="..\..\engines\gob\mult.h" />
+		<File RelativePath="..\..\engines\gob\mult_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\mult_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.cpp" />
+		<File RelativePath="..\..\engines\gob\palanim.h" />
+		<File RelativePath="..\..\engines\gob\resources.cpp" />
+		<File RelativePath="..\..\engines\gob\resources.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter.h" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveconverter_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savefile.h" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.cpp" />
+		<File RelativePath="..\..\engines\gob\save\savehandler.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload.h" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v3.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v4.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\save\saveload_playtoons.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery.h" />
+		<File RelativePath="..\..\engines\gob\scenery_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\scenery_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\demos\scnplayer.h" />
+		<File RelativePath="..\..\engines\gob\script.cpp" />
+		<File RelativePath="..\..\engines\gob\script.h" />
+		<File RelativePath="..\..\engines\gob\totfile.cpp" />
+		<File RelativePath="..\..\engines\gob\totfile.h" />
+		<File RelativePath="..\..\engines\gob\util.cpp" />
+		<File RelativePath="..\..\engines\gob\util.h" />
+		<File RelativePath="..\..\engines\gob\variables.cpp" />
+		<File RelativePath="..\..\engines\gob\variables.h" />
+		<File RelativePath="..\..\engines\gob\video.cpp" />
+		<File RelativePath="..\..\engines\gob\video.h" />
+		<File RelativePath="..\..\engines\gob\video_v1.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v2.cpp" />
+		<File RelativePath="..\..\engines\gob\video_v6.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.cpp" />
+		<File RelativePath="..\..\engines\gob\videoplayer.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/groovie.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/groovie.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/groovie.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,275 +8,41 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="groovie_Debug"
-			IntermediateDirectory="groovie_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS; ENABLE_RGB_COLOR; GROOVIE_EXPERIMENTAL"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				SuppressStartupBanner="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="groovie_Release"
-			IntermediateDirectory="groovie_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/groovie.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\groovie\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cell.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\cursor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\debug.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\font.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\graphics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\groovie.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\lzss.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\music.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\player.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\roq.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\saveload.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\groovie\vdx.h"
-			>
-		</File>
+		<File RelativePath="..\..\engines\groovie\cell.cpp" />
+		<File RelativePath="..\..\engines\groovie\cell.h" />
+		<File RelativePath="..\..\engines\groovie\cursor.cpp" />
+		<File RelativePath="..\..\engines\groovie\cursor.h" />
+		<File RelativePath="..\..\engines\groovie\debug.cpp" />
+		<File RelativePath="..\..\engines\groovie\debug.h" />
+		<File RelativePath="..\..\engines\groovie\detection.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.cpp" />
+		<File RelativePath="..\..\engines\groovie\font.h" />
+		<File RelativePath="..\..\engines\groovie\graphics.cpp" />
+		<File RelativePath="..\..\engines\groovie\graphics.h" />
+		<File RelativePath="..\..\engines\groovie\groovie.cpp" />
+		<File RelativePath="..\..\engines\groovie\groovie.h" />
+		<File RelativePath="..\..\engines\groovie\lzss.cpp" />
+		<File RelativePath="..\..\engines\groovie\lzss.h" />
+		<File RelativePath="..\..\engines\groovie\music.cpp" />
+		<File RelativePath="..\..\engines\groovie\music.h" />
+		<File RelativePath="..\..\engines\groovie\player.cpp" />
+		<File RelativePath="..\..\engines\groovie\player.h" />
+		<File RelativePath="..\..\engines\groovie\resource.cpp" />
+		<File RelativePath="..\..\engines\groovie\resource.h" />
+		<File RelativePath="..\..\engines\groovie\roq.cpp" />
+		<File RelativePath="..\..\engines\groovie\roq.h" />
+		<File RelativePath="..\..\engines\groovie\saveload.cpp" />
+		<File RelativePath="..\..\engines\groovie\saveload.h" />		
+		<File RelativePath="..\..\engines\groovie\script.cpp" />
+		<File RelativePath="..\..\engines\groovie\script.h" />
+		<File RelativePath="..\..\engines\groovie\vdx.cpp" />
+		<File RelativePath="..\..\engines\groovie\vdx.h" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/igor.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/igor.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/igor.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,321 +8,52 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="igor_Debug"
-			IntermediateDirectory="igor_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="igor_Release"
-			IntermediateDirectory="igor_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/igor.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="parts"
-			>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_04.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_05.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_06.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_12.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_13.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_14.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_15.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_16.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_17.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_18.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_19.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_21.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_22.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_23.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_24.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_25.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_26.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_27.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_28.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_30.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_31.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_33.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_36.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_37.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_75.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_85.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_90.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_95.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\igor\parts\part_main.cpp"
-				>
-			</File>
+		<Filter Name="parts">
+			<File RelativePath="..\..\engines\igor\parts\part_04.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_05.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_06.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_12.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_13.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_14.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_15.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_16.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_17.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_18.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_19.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_21.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_22.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_23.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_24.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_25.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_26.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_27.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_28.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_30.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_31.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_33.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_36.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_37.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_75.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_85.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_90.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_95.cpp" />
+			<File RelativePath="..\..\engines\igor\parts\part_main.cpp" />
 		</Filter>
-		<File
-			RelativePath="..\..\engines\igor\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\igor.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\menu.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\midi.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\resource_ids.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\igor\staticres.cpp"
-			>
-		</File>
+		<File RelativePath="..\..\engines\igor\detection.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.cpp" />
+		<File RelativePath="..\..\engines\igor\igor.h" />
+		<File RelativePath="..\..\engines\igor\menu.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.cpp" />
+		<File RelativePath="..\..\engines\igor\midi.h" />
+		<File RelativePath="..\..\engines\igor\resource_ids.h" />
+		<File RelativePath="..\..\engines\igor\saveload.cpp" />
+		<File RelativePath="..\..\engines\igor\staticres.cpp" />
 	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>

Modified: scummvm/branches/gsoc2009-16bit/dists/msvc8/kyra.vcproj
===================================================================
--- scummvm/branches/gsoc2009-16bit/dists/msvc8/kyra.vcproj	2009-07-09 22:40:07 UTC (rev 42317)
+++ scummvm/branches/gsoc2009-16bit/dists/msvc8/kyra.vcproj	2009-07-10 00:07:26 UTC (rev 42318)
@@ -8,629 +8,128 @@
 	Keyword="Win32Proj"
 	>
 	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
+		<Platform Name="Win32" />
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="kyra_Debug"
-			IntermediateDirectory="kyra_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="0"
-				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="true"
-				EnableFunctionLevelLinking="true"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				SuppressStartupBanner="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="kyra_Release"
-			IntermediateDirectory="kyra_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;ENABLE_LOL"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				DisableLanguageExtensions="false"
-				ForceConformanceInForLoopScope="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/kyra.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration Name="Debug|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Debug.vsprops" />
+		<Configuration Name="Release|Win32" ConfigurationType="4" InheritedPropertySheets=".\ScummVM_Release.vsprops" />
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\kyra\animator_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\debugger.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\detection.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\gui_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v1.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\kyra_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\resource_intern.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_hof.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lok.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_lol.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\screen_v2.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lok.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_lol.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_mr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_tim.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v2.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp"
-			>
-		</File>
-		<File

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list