[Scummvm-cvs-logs] SF.net SVN: scummvm: [20615] scummvm/trunk/dists/msvc8

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun Feb 12 06:10:02 CET 2006


Revision: 20615
Author:   aquadran
Date:     2006-02-12 06:08:45 -0800 (Sun, 12 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20615&view=rev

Log Message:
-----------
updated msvc8 project files to latest 'engines' directory changes

Modified Paths:
--------------
    scummvm/trunk/dists/msvc8/gob.vcproj
    scummvm/trunk/dists/msvc8/kyra.vcproj
    scummvm/trunk/dists/msvc8/lure.vcproj
    scummvm/trunk/dists/msvc8/queen.vcproj
    scummvm/trunk/dists/msvc8/saga.vcproj
    scummvm/trunk/dists/msvc8/scumm.vcproj
    scummvm/trunk/dists/msvc8/scummvm.vcproj
    scummvm/trunk/dists/msvc8/simon.vcproj
    scummvm/trunk/dists/msvc8/sky.vcproj
    scummvm/trunk/dists/msvc8/sword1.vcproj
    scummvm/trunk/dists/msvc8/sword2.vcproj
Modified: scummvm/trunk/dists/msvc8/gob.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/gob.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/gob.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,195 +159,195 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\gob\anim.cpp"
+			RelativePath="..\..\engines\gob\anim.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\anim.h"
+			RelativePath="..\..\engines\gob\anim.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\cdrom.cpp"
+			RelativePath="..\..\engines\gob\cdrom.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\cdrom.h"
+			RelativePath="..\..\engines\gob\cdrom.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\dataio.cpp"
+			RelativePath="..\..\engines\gob\dataio.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\dataio.h"
+			RelativePath="..\..\engines\gob\dataio.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\draw.cpp"
+			RelativePath="..\..\engines\gob\draw.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\draw.h"
+			RelativePath="..\..\engines\gob\draw.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\driver_vga.cpp"
+			RelativePath="..\..\engines\gob\driver_vga.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\driver_vga.h"
+			RelativePath="..\..\engines\gob\driver_vga.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\game.cpp"
+			RelativePath="..\..\engines\gob\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\game.h"
+			RelativePath="..\..\engines\gob\game.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\global.cpp"
+			RelativePath="..\..\engines\gob\global.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\global.h"
+			RelativePath="..\..\engines\gob\global.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\gob.cpp"
+			RelativePath="..\..\engines\gob\gob.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\gob.h"
+			RelativePath="..\..\engines\gob\gob.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\goblin.cpp"
+			RelativePath="..\..\engines\gob\goblin.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\goblin.h"
+			RelativePath="..\..\engines\gob\goblin.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\init.cpp"
+			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\init.h"
+			RelativePath="..\..\engines\gob\init.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\inter.cpp"
+			RelativePath="..\..\engines\gob\inter.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\inter.h"
+			RelativePath="..\..\engines\gob\inter.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\inter_v1.cpp"
+			RelativePath="..\..\engines\gob\inter_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\inter_v2.cpp"
+			RelativePath="..\..\engines\gob\inter_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\map.cpp"
+			RelativePath="..\..\engines\gob\map.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\map.h"
+			RelativePath="..\..\engines\gob\map.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\mult.cpp"
+			RelativePath="..\..\engines\gob\mult.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\mult.h"
+			RelativePath="..\..\engines\gob\mult.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\music.cpp"
+			RelativePath="..\..\engines\gob\music.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\music.h"
+			RelativePath="..\..\engines\gob\music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\pack.cpp"
+			RelativePath="..\..\engines\gob\pack.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\pack.h"
+			RelativePath="..\..\engines\gob\pack.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\palanim.cpp"
+			RelativePath="..\..\engines\gob\palanim.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\palanim.h"
+			RelativePath="..\..\engines\gob\palanim.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\parse.cpp"
+			RelativePath="..\..\engines\gob\parse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\parse.h"
+			RelativePath="..\..\engines\gob\parse.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\parse_v1.cpp"
+			RelativePath="..\..\engines\gob\parse_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\parse_v2.cpp"
+			RelativePath="..\..\engines\gob\parse_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\scenery.cpp"
+			RelativePath="..\..\engines\gob\scenery.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\scenery.h"
+			RelativePath="..\..\engines\gob\scenery.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\sound.cpp"
+			RelativePath="..\..\engines\gob\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\sound.h"
+			RelativePath="..\..\engines\gob\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\timer.cpp"
+			RelativePath="..\..\engines\gob\timer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\timer.h"
+			RelativePath="..\..\engines\gob\timer.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\util.cpp"
+			RelativePath="..\..\engines\gob\util.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\util.h"
+			RelativePath="..\..\engines\gob\util.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\video.cpp"
+			RelativePath="..\..\engines\gob\video.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\gob\video.h"
+			RelativePath="..\..\engines\gob\video.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/kyra.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/kyra.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/kyra.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,123 +159,123 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\kyra\animator.cpp"
+			RelativePath="..\..\engines\kyra\animator.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\animator.h"
+			RelativePath="..\..\engines\kyra\animator.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\debugger.cpp"
+			RelativePath="..\..\engines\kyra\debugger.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\debugger.h"
+			RelativePath="..\..\engines\kyra\debugger.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\gui.cpp"
+			RelativePath="..\..\engines\kyra\gui.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\items.cpp"
+			RelativePath="..\..\engines\kyra\items.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\kyra.cpp"
+			RelativePath="..\..\engines\kyra\kyra.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\kyra.h"
+			RelativePath="..\..\engines\kyra\kyra.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\resource.cpp"
+			RelativePath="..\..\engines\kyra\resource.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\resource.h"
+			RelativePath="..\..\engines\kyra\resource.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\saveload.cpp"
+			RelativePath="..\..\engines\kyra\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\scene.cpp"
+			RelativePath="..\..\engines\kyra\scene.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\screen.cpp"
+			RelativePath="..\..\engines\kyra\screen.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\screen.h"
+			RelativePath="..\..\engines\kyra\screen.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\script.cpp"
+			RelativePath="..\..\engines\kyra\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\script.h"
+			RelativePath="..\..\engines\kyra\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\script_v1.cpp"
+			RelativePath="..\..\engines\kyra\script_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\seqplayer.cpp"
+			RelativePath="..\..\engines\kyra\seqplayer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\seqplayer.h"
+			RelativePath="..\..\engines\kyra\seqplayer.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\sequences_v1.cpp"
+			RelativePath="..\..\engines\kyra\sequences_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\sound.cpp"
+			RelativePath="..\..\engines\kyra\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\sound.h"
+			RelativePath="..\..\engines\kyra\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\sprites.cpp"
+			RelativePath="..\..\engines\kyra\sprites.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\sprites.h"
+			RelativePath="..\..\engines\kyra\sprites.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\staticres.cpp"
+			RelativePath="..\..\engines\kyra\staticres.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\text.cpp"
+			RelativePath="..\..\engines\kyra\text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\text.h"
+			RelativePath="..\..\engines\kyra\text.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\timer.cpp"
+			RelativePath="..\..\engines\kyra\timer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\wsamovie.cpp"
+			RelativePath="..\..\engines\kyra\wsamovie.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\kyra\wsamovie.h"
+			RelativePath="..\..\engines\kyra\wsamovie.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/lure.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/lure.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/lure.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,175 +159,175 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\lure\animseq.cpp"
+			RelativePath="..\..\engines\lure\animseq.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\animseq.h"
+			RelativePath="..\..\engines\lure\animseq.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\debug-input.cpp"
+			RelativePath="..\..\engines\lure\debug-input.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\debug-input.h"
+			RelativePath="..\..\engines\lure\debug-input.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\debug-methods.cpp"
+			RelativePath="..\..\engines\lure\debug-methods.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\debug-methods.h"
+			RelativePath="..\..\engines\lure\debug-methods.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\decode.cpp"
+			RelativePath="..\..\engines\lure\decode.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\decode.h"
+			RelativePath="..\..\engines\lure\decode.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\disk.cpp"
+			RelativePath="..\..\engines\lure\disk.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\disk.h"
+			RelativePath="..\..\engines\lure\disk.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\events.cpp"
+			RelativePath="..\..\engines\lure\events.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\events.h"
+			RelativePath="..\..\engines\lure\events.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\game.cpp"
+			RelativePath="..\..\engines\lure\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\game.h"
+			RelativePath="..\..\engines\lure\game.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\hotspots.cpp"
+			RelativePath="..\..\engines\lure\hotspots.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\hotspots.h"
+			RelativePath="..\..\engines\lure\hotspots.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\intro.cpp"
+			RelativePath="..\..\engines\lure\intro.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\intro.h"
+			RelativePath="..\..\engines\lure\intro.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\lure.cpp"
+			RelativePath="..\..\engines\lure\lure.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\lure.h"
+			RelativePath="..\..\engines\lure\lure.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\luredefs.h"
+			RelativePath="..\..\engines\lure\luredefs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\memory.cpp"
+			RelativePath="..\..\engines\lure\memory.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\memory.h"
+			RelativePath="..\..\engines\lure\memory.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\menu.cpp"
+			RelativePath="..\..\engines\lure\menu.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\menu.h"
+			RelativePath="..\..\engines\lure\menu.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\palette.cpp"
+			RelativePath="..\..\engines\lure\palette.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\palette.h"
+			RelativePath="..\..\engines\lure\palette.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\res.cpp"
+			RelativePath="..\..\engines\lure\res.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\res.h"
+			RelativePath="..\..\engines\lure\res.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\res_struct.cpp"
+			RelativePath="..\..\engines\lure\res_struct.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\res_struct.h"
+			RelativePath="..\..\engines\lure\res_struct.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\room.cpp"
+			RelativePath="..\..\engines\lure\room.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\room.h"
+			RelativePath="..\..\engines\lure\room.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\screen.cpp"
+			RelativePath="..\..\engines\lure\screen.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\screen.h"
+			RelativePath="..\..\engines\lure\screen.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\scripts.cpp"
+			RelativePath="..\..\engines\lure\scripts.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\scripts.h"
+			RelativePath="..\..\engines\lure\scripts.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\strings.cpp"
+			RelativePath="..\..\engines\lure\strings.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\strings.h"
+			RelativePath="..\..\engines\lure\strings.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\surface.cpp"
+			RelativePath="..\..\engines\lure\surface.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\surface.h"
+			RelativePath="..\..\engines\lure\surface.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\system.cpp"
+			RelativePath="..\..\engines\lure\system.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\lure\system.h"
+			RelativePath="..\..\engines\lure\system.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/queen.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/queen.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/queen.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,163 +159,163 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\queen\bankman.cpp"
+			RelativePath="..\..\engines\queen\bankman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\bankman.h"
+			RelativePath="..\..\engines\queen\bankman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\command.cpp"
+			RelativePath="..\..\engines\queen\command.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\command.h"
+			RelativePath="..\..\engines\queen\command.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\credits.cpp"
+			RelativePath="..\..\engines\queen\credits.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\credits.h"
+			RelativePath="..\..\engines\queen\credits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\cutaway.cpp"
+			RelativePath="..\..\engines\queen\cutaway.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\cutaway.h"
+			RelativePath="..\..\engines\queen\cutaway.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\debug.cpp"
+			RelativePath="..\..\engines\queen\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\debug.h"
+			RelativePath="..\..\engines\queen\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\defs.h"
+			RelativePath="..\..\engines\queen\defs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\display.cpp"
+			RelativePath="..\..\engines\queen\display.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\display.h"
+			RelativePath="..\..\engines\queen\display.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\graphics.cpp"
+			RelativePath="..\..\engines\queen\graphics.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\graphics.h"
+			RelativePath="..\..\engines\queen\graphics.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\grid.cpp"
+			RelativePath="..\..\engines\queen\grid.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\grid.h"
+			RelativePath="..\..\engines\queen\grid.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\input.cpp"
+			RelativePath="..\..\engines\queen\input.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\input.h"
+			RelativePath="..\..\engines\queen\input.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\journal.cpp"
+			RelativePath="..\..\engines\queen\journal.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\journal.h"
+			RelativePath="..\..\engines\queen\journal.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\logic.cpp"
+			RelativePath="..\..\engines\queen\logic.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\logic.h"
+			RelativePath="..\..\engines\queen\logic.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\music.cpp"
+			RelativePath="..\..\engines\queen\music.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\music.h"
+			RelativePath="..\..\engines\queen\music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\musicdata.cpp"
+			RelativePath="..\..\engines\queen\musicdata.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\queen.cpp"
+			RelativePath="..\..\engines\queen\queen.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\queen.h"
+			RelativePath="..\..\engines\queen\queen.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\resource.cpp"
+			RelativePath="..\..\engines\queen\resource.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\resource.h"
+			RelativePath="..\..\engines\queen\resource.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\restables.cpp"
+			RelativePath="..\..\engines\queen\restables.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\sound.cpp"
+			RelativePath="..\..\engines\queen\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\sound.h"
+			RelativePath="..\..\engines\queen\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\state.cpp"
+			RelativePath="..\..\engines\queen\state.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\state.h"
+			RelativePath="..\..\engines\queen\state.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\structs.h"
+			RelativePath="..\..\engines\queen\structs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\talk.cpp"
+			RelativePath="..\..\engines\queen\talk.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\talk.h"
+			RelativePath="..\..\engines\queen\talk.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\walk.cpp"
+			RelativePath="..\..\engines\queen\walk.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\queen\walk.h"
+			RelativePath="..\..\engines\queen\walk.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/saga.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/saga.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/saga.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,219 +159,219 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\saga\actor.cpp"
+			RelativePath="..\..\engines\saga\actor.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\actor.h"
+			RelativePath="..\..\engines\saga\actor.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\animation.cpp"
+			RelativePath="..\..\engines\saga\animation.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\animation.h"
+			RelativePath="..\..\engines\saga\animation.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\console.cpp"
+			RelativePath="..\..\engines\saga\console.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\console.h"
+			RelativePath="..\..\engines\saga\console.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\events.cpp"
+			RelativePath="..\..\engines\saga\events.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\events.h"
+			RelativePath="..\..\engines\saga\events.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\font.cpp"
+			RelativePath="..\..\engines\saga\font.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\font.h"
+			RelativePath="..\..\engines\saga\font.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\font_map.cpp"
+			RelativePath="..\..\engines\saga\font_map.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\game.cpp"
+			RelativePath="..\..\engines\saga\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\gfx.cpp"
+			RelativePath="..\..\engines\saga\gfx.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\gfx.h"
+			RelativePath="..\..\engines\saga\gfx.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\ihnm_introproc.cpp"
+			RelativePath="..\..\engines\saga\ihnm_introproc.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\image.cpp"
+			RelativePath="..\..\engines\saga\image.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\input.cpp"
+			RelativePath="..\..\engines\saga\input.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\interface.cpp"
+			RelativePath="..\..\engines\saga\interface.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\interface.h"
+			RelativePath="..\..\engines\saga\interface.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\isomap.cpp"
+			RelativePath="..\..\engines\saga\isomap.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\isomap.h"
+			RelativePath="..\..\engines\saga\isomap.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\ite_introproc.cpp"
+			RelativePath="..\..\engines\saga\ite_introproc.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\itedata.cpp"
+			RelativePath="..\..\engines\saga\itedata.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\itedata.h"
+			RelativePath="..\..\engines\saga\itedata.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\list.h"
+			RelativePath="..\..\engines\saga\list.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\music.cpp"
+			RelativePath="..\..\engines\saga\music.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\music.h"
+			RelativePath="..\..\engines\saga\music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\objectmap.cpp"
+			RelativePath="..\..\engines\saga\objectmap.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\objectmap.h"
+			RelativePath="..\..\engines\saga\objectmap.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\palanim.cpp"
+			RelativePath="..\..\engines\saga\palanim.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\palanim.h"
+			RelativePath="..\..\engines\saga\palanim.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\puzzle.cpp"
+			RelativePath="..\..\engines\saga\puzzle.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\puzzle.h"
+			RelativePath="..\..\engines\saga\puzzle.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\render.cpp"
+			RelativePath="..\..\engines\saga\render.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\render.h"
+			RelativePath="..\..\engines\saga\render.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\resnames.h"
+			RelativePath="..\..\engines\saga\resnames.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\rscfile.cpp"
+			RelativePath="..\..\engines\saga\rscfile.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\rscfile.h"
+			RelativePath="..\..\engines\saga\rscfile.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\saga.cpp"
+			RelativePath="..\..\engines\saga\saga.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\saga.h"
+			RelativePath="..\..\engines\saga\saga.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\saveload.cpp"
+			RelativePath="..\..\engines\saga\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\scene.cpp"
+			RelativePath="..\..\engines\saga\scene.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\scene.h"
+			RelativePath="..\..\engines\saga\scene.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\script.cpp"
+			RelativePath="..\..\engines\saga\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\script.h"
+			RelativePath="..\..\engines\saga\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sfuncs.cpp"
+			RelativePath="..\..\engines\saga\sfuncs.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sndres.cpp"
+			RelativePath="..\..\engines\saga\sndres.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sndres.h"
+			RelativePath="..\..\engines\saga\sndres.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sound.cpp"
+			RelativePath="..\..\engines\saga\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sound.h"
+			RelativePath="..\..\engines\saga\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sprite.cpp"
+			RelativePath="..\..\engines\saga\sprite.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sprite.h"
+			RelativePath="..\..\engines\saga\sprite.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sthread.cpp"
+			RelativePath="..\..\engines\saga\sthread.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\stream.h"
+			RelativePath="..\..\engines\saga\stream.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scumm.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/scumm.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -163,71 +163,71 @@
 			Name="smush"
 			>
 			<File
-				RelativePath="..\..\scumm\smush\channel.h"
+				RelativePath="..\..\engines\scumm\smush\channel.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk.cpp"
+				RelativePath="..\..\engines\scumm\smush\chunk.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk.h"
+				RelativePath="..\..\engines\scumm\smush\chunk.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\chunk_type.h"
+				RelativePath="..\..\engines\scumm\smush\chunk_type.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec1.cpp"
+				RelativePath="..\..\engines\scumm\smush\codec1.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec37.cpp"
+				RelativePath="..\..\engines\scumm\smush\codec37.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec37.h"
+				RelativePath="..\..\engines\scumm\smush\codec37.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec47.cpp"
+				RelativePath="..\..\engines\scumm\smush\codec47.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\codec47.h"
+				RelativePath="..\..\engines\scumm\smush\codec47.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\imuse_channel.cpp"
+				RelativePath="..\..\engines\scumm\smush\imuse_channel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\saud_channel.cpp"
+				RelativePath="..\..\engines\scumm\smush\saud_channel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_font.cpp"
+				RelativePath="..\..\engines\scumm\smush\smush_font.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_font.h"
+				RelativePath="..\..\engines\scumm\smush\smush_font.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_mixer.cpp"
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_mixer.h"
+				RelativePath="..\..\engines\scumm\smush\smush_mixer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_player.cpp"
+				RelativePath="..\..\engines\scumm\smush\smush_player.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\smush\smush_player.h"
+				RelativePath="..\..\engines\scumm\smush\smush_player.h"
 				>
 			</File>
 		</Filter>
@@ -235,47 +235,47 @@
 			Name="imuse_digi"
 			>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse.h"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_bndmgr.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_bndmgr.h"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_codecs.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_music.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_music.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_script.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_script.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_sndmgr.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_sndmgr.h"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_tables.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\imuse_digi\dimuse_track.cpp"
+				RelativePath="..\..\engines\scumm\imuse_digi\dimuse_track.cpp"
 				>
 			</File>
 		</Filter>
@@ -283,428 +283,428 @@
 			Name="insane"
 			>
 			<File
-				RelativePath="..\..\scumm\insane\insane.cpp"
+				RelativePath="..\..\engines\scumm\insane\insane.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane.h"
+				RelativePath="..\..\engines\scumm\insane\insane.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_ben.cpp"
+				RelativePath="..\..\engines\scumm\insane\insane_ben.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_enemy.cpp"
+				RelativePath="..\..\engines\scumm\insane\insane_enemy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_iact.cpp"
+				RelativePath="..\..\engines\scumm\insane\insane_iact.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\scumm\insane\insane_scenes.cpp"
+				RelativePath="..\..\engines\scumm\insane\insane_scenes.cpp"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\scumm\actor.cpp"
+			RelativePath="..\..\engines\scumm\actor.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\actor.h"
+			RelativePath="..\..\engines\scumm\actor.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\akos.cpp"
+			RelativePath="..\..\engines\scumm\akos.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\akos.h"
+			RelativePath="..\..\engines\scumm\akos.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\base-costume.cpp"
+			RelativePath="..\..\engines\scumm\base-costume.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\base-costume.h"
+			RelativePath="..\..\engines\scumm\base-costume.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\bomp.cpp"
+			RelativePath="..\..\engines\scumm\bomp.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\bomp.h"
+			RelativePath="..\..\engines\scumm\bomp.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\boxes.cpp"
+			RelativePath="..\..\engines\scumm\boxes.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\boxes.h"
+			RelativePath="..\..\engines\scumm\boxes.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\camera.cpp"
+			RelativePath="..\..\engines\scumm\camera.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\charset.cpp"
+			RelativePath="..\..\engines\scumm\charset.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\charset.h"
+			RelativePath="..\..\engines\scumm\charset.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\costume.cpp"
+			RelativePath="..\..\engines\scumm\costume.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\costume.h"
+			RelativePath="..\..\engines\scumm\costume.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\cursor.cpp"
+			RelativePath="..\..\engines\scumm\cursor.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\debugger.cpp"
+			RelativePath="..\..\engines\scumm\debugger.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\debugger.h"
+			RelativePath="..\..\engines\scumm\debugger.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\dialogs.cpp"
+			RelativePath="..\..\engines\scumm\dialogs.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\dialogs.h"
+			RelativePath="..\..\engines\scumm\dialogs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\floodfill_he.cpp"
+			RelativePath="..\..\engines\scumm\floodfill_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\floodfill_he.h"
+			RelativePath="..\..\engines\scumm\floodfill_he.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\gfx.cpp"
+			RelativePath="..\..\engines\scumm\gfx.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\gfx.h"
+			RelativePath="..\..\engines\scumm\gfx.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\help.cpp"
+			RelativePath="..\..\engines\scumm\help.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\help.h"
+			RelativePath="..\..\engines\scumm\help.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse.cpp"
+			RelativePath="..\..\engines\scumm\imuse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse.h"
+			RelativePath="..\..\engines\scumm\imuse.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse_internal.h"
+			RelativePath="..\..\engines\scumm\imuse_internal.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\imuse_player.cpp"
+			RelativePath="..\..\engines\scumm\imuse_player.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\input.cpp"
+			RelativePath="..\..\engines\scumm\input.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\instrument.cpp"
+			RelativePath="..\..\engines\scumm\instrument.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\instrument.h"
+			RelativePath="..\..\engines\scumm\instrument.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\intern.h"
+			RelativePath="..\..\engines\scumm\intern.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\intern_he.h"
+			RelativePath="..\..\engines\scumm\intern_he.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\logic_he.cpp"
+			RelativePath="..\..\engines\scumm\logic_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\logic_he.h"
+			RelativePath="..\..\engines\scumm\logic_he.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\midiparser_eup.cpp"
+			RelativePath="..\..\engines\scumm\midiparser_eup.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\midiparser_ro.cpp"
+			RelativePath="..\..\engines\scumm\midiparser_ro.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\music.h"
+			RelativePath="..\..\engines\scumm\music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\nut_renderer.cpp"
+			RelativePath="..\..\engines\scumm\nut_renderer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\nut_renderer.h"
+			RelativePath="..\..\engines\scumm\nut_renderer.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\object.cpp"
+			RelativePath="..\..\engines\scumm\object.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\object.h"
+			RelativePath="..\..\engines\scumm\object.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\palette.cpp"
+			RelativePath="..\..\engines\scumm\palette.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\palette_he.cpp"
+			RelativePath="..\..\engines\scumm\palette_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_mod.cpp"
+			RelativePath="..\..\engines\scumm\player_mod.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_mod.h"
+			RelativePath="..\..\engines\scumm\player_mod.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_nes.cpp"
+			RelativePath="..\..\engines\scumm\player_nes.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_nes.h"
+			RelativePath="..\..\engines\scumm\player_nes.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v1.cpp"
+			RelativePath="..\..\engines\scumm\player_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v1.h"
+			RelativePath="..\..\engines\scumm\player_v1.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2.cpp"
+			RelativePath="..\..\engines\scumm\player_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2.h"
+			RelativePath="..\..\engines\scumm\player_v2.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2a.cpp"
+			RelativePath="..\..\engines\scumm\player_v2a.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v2a.h"
+			RelativePath="..\..\engines\scumm\player_v2a.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v3a.cpp"
+			RelativePath="..\..\engines\scumm\player_v3a.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\player_v3a.h"
+			RelativePath="..\..\engines\scumm\player_v3a.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource.cpp"
+			RelativePath="..\..\engines\scumm\resource.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource.h"
+			RelativePath="..\..\engines\scumm\resource.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v2.cpp"
+			RelativePath="..\..\engines\scumm\resource_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v3.cpp"
+			RelativePath="..\..\engines\scumm\resource_v3.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v4.cpp"
+			RelativePath="..\..\engines\scumm\resource_v4.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v7he.cpp"
+			RelativePath="..\..\engines\scumm\resource_v7he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\resource_v7he.h"
+			RelativePath="..\..\engines\scumm\resource_v7he.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\room.cpp"
+			RelativePath="..\..\engines\scumm\room.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\saveload.cpp"
+			RelativePath="..\..\engines\scumm\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\saveload.h"
+			RelativePath="..\..\engines\scumm\saveload.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script.cpp"
+			RelativePath="..\..\engines\scumm\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script.h"
+			RelativePath="..\..\engines\scumm\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_c64.cpp"
+			RelativePath="..\..\engines\scumm\script_c64.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v100he.cpp"
+			RelativePath="..\..\engines\scumm\script_v100he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v2.cpp"
+			RelativePath="..\..\engines\scumm\script_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v5.cpp"
+			RelativePath="..\..\engines\scumm\script_v5.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v6.cpp"
+			RelativePath="..\..\engines\scumm\script_v6.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v6he.cpp"
+			RelativePath="..\..\engines\scumm\script_v6he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v72he.cpp"
+			RelativePath="..\..\engines\scumm\script_v72he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v7he.cpp"
+			RelativePath="..\..\engines\scumm\script_v7he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v8.cpp"
+			RelativePath="..\..\engines\scumm\script_v8.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v80he.cpp"
+			RelativePath="..\..\engines\scumm\script_v80he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v90he.cpp"
+			RelativePath="..\..\engines\scumm\script_v90he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm-md5.h"
+			RelativePath="..\..\engines\scumm\scumm-md5.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm.cpp"
+			RelativePath="..\..\engines\scumm\scumm.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\scumm.h"
+			RelativePath="..\..\engines\scumm\scumm.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\sound.cpp"
+			RelativePath="..\..\engines\scumm\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\sound.h"
+			RelativePath="..\..\engines\scumm\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\sound_he.cpp"
+			RelativePath="..\..\engines\scumm\sound_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\sprite_he.cpp"
+			RelativePath="..\..\engines\scumm\sprite_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\sprite_he.h"
+			RelativePath="..\..\engines\scumm\sprite_he.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\string.cpp"
+			RelativePath="..\..\engines\scumm\string.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\thumbnail.cpp"
+			RelativePath="..\..\engines\scumm\thumbnail.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\usage_bits.cpp"
+			RelativePath="..\..\engines\scumm\usage_bits.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\usage_bits.h"
+			RelativePath="..\..\engines\scumm\usage_bits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\util.cpp"
+			RelativePath="..\..\engines\scumm\util.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\util.h"
+			RelativePath="..\..\engines\scumm\util.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\vars.cpp"
+			RelativePath="..\..\engines\scumm\vars.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\verbs.cpp"
+			RelativePath="..\..\engines\scumm\verbs.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\verbs.h"
+			RelativePath="..\..\engines\scumm\verbs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\wiz_he.cpp"
+			RelativePath="..\..\engines\scumm\wiz_he.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\scumm\wiz_he.h"
+			RelativePath="..\..\engines\scumm\wiz_he.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -129,7 +129,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
 				StringPooling="true"
 				MinimalRebuild="false"

Modified: scummvm/trunk/dists/msvc8/simon.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/simon.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/simon.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -113,7 +113,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -160,91 +160,91 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\simon\charset.cpp"
+			RelativePath="..\..\engines\simon\charset.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\cursor.cpp"
+			RelativePath="..\..\engines\simon\cursor.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\debug.cpp"
+			RelativePath="..\..\engines\simon\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\debug.h"
+			RelativePath="..\..\engines\simon\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\debugger.cpp"
+			RelativePath="..\..\engines\simon\debugger.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\debugger.h"
+			RelativePath="..\..\engines\simon\debugger.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\game.cpp"
+			RelativePath="..\..\engines\simon\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\icons.cpp"
+			RelativePath="..\..\engines\simon\icons.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\intern.h"
+			RelativePath="..\..\engines\simon\intern.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\items.cpp"
+			RelativePath="..\..\engines\simon\items.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\midi.cpp"
+			RelativePath="..\..\engines\simon\midi.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\midi.h"
+			RelativePath="..\..\engines\simon\midi.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\midiparser_s1d.cpp"
+			RelativePath="..\..\engines\simon\midiparser_s1d.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\res.cpp"
+			RelativePath="..\..\engines\simon\res.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\saveload.cpp"
+			RelativePath="..\..\engines\simon\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\simon.cpp"
+			RelativePath="..\..\engines\simon\simon.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\simon.h"
+			RelativePath="..\..\engines\simon\simon.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\sound.cpp"
+			RelativePath="..\..\engines\simon\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\sound.h"
+			RelativePath="..\..\engines\simon\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\verb.cpp"
+			RelativePath="..\..\engines\simon\verb.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\vga.cpp"
+			RelativePath="..\..\engines\simon\vga.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\simon\vga.h"
+			RelativePath="..\..\engines\simon\vga.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/sky.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sky.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/sky.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -163,176 +163,176 @@
 			Name="music"
 			>
 			<File
-				RelativePath="..\..\sky\music\adlibchannel.cpp"
+				RelativePath="..\..\engines\sky\music\adlibchannel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\adlibchannel.h"
+				RelativePath="..\..\engines\sky\music\adlibchannel.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\adlibmusic.cpp"
+				RelativePath="..\..\engines\sky\music\adlibmusic.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\adlibmusic.h"
+				RelativePath="..\..\engines\sky\music\adlibmusic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\gmchannel.cpp"
+				RelativePath="..\..\engines\sky\music\gmchannel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\gmchannel.h"
+				RelativePath="..\..\engines\sky\music\gmchannel.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\gmmusic.cpp"
+				RelativePath="..\..\engines\sky\music\gmmusic.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\gmmusic.h"
+				RelativePath="..\..\engines\sky\music\gmmusic.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\mt32music.cpp"
+				RelativePath="..\..\engines\sky\music\mt32music.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\mt32music.h"
+				RelativePath="..\..\engines\sky\music\mt32music.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\musicbase.cpp"
+				RelativePath="..\..\engines\sky\music\musicbase.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sky\music\musicbase.h"
+				RelativePath="..\..\engines\sky\music\musicbase.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\sky\autoroute.cpp"
+			RelativePath="..\..\engines\sky\autoroute.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\autoroute.h"
+			RelativePath="..\..\engines\sky\autoroute.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\compact.cpp"
+			RelativePath="..\..\engines\sky\compact.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\compact.h"
+			RelativePath="..\..\engines\sky\compact.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\control.cpp"
+			RelativePath="..\..\engines\sky\control.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\control.h"
+			RelativePath="..\..\engines\sky\control.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\debug.cpp"
+			RelativePath="..\..\engines\sky\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\debug.h"
+			RelativePath="..\..\engines\sky\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\disk.cpp"
+			RelativePath="..\..\engines\sky\disk.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\disk.h"
+			RelativePath="..\..\engines\sky\disk.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\grid.cpp"
+			RelativePath="..\..\engines\sky\grid.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\grid.h"
+			RelativePath="..\..\engines\sky\grid.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\hufftext.cpp"
+			RelativePath="..\..\engines\sky\hufftext.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\intro.cpp"
+			RelativePath="..\..\engines\sky\intro.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\intro.h"
+			RelativePath="..\..\engines\sky\intro.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\logic.cpp"
+			RelativePath="..\..\engines\sky\logic.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\logic.h"
+			RelativePath="..\..\engines\sky\logic.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\mouse.cpp"
+			RelativePath="..\..\engines\sky\mouse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\mouse.h"
+			RelativePath="..\..\engines\sky\mouse.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\rnc_deco.cpp"
+			RelativePath="..\..\engines\sky\rnc_deco.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\rnc_deco.h"
+			RelativePath="..\..\engines\sky\rnc_deco.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\screen.cpp"
+			RelativePath="..\..\engines\sky\screen.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\screen.h"
+			RelativePath="..\..\engines\sky\screen.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\sky.cpp"
+			RelativePath="..\..\engines\sky\sky.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\sky.h"
+			RelativePath="..\..\engines\sky\sky.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\skydefs.h"
+			RelativePath="..\..\engines\sky\skydefs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\sound.cpp"
+			RelativePath="..\..\engines\sky\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\sound.h"
+			RelativePath="..\..\engines\sky\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\struc.h"
+			RelativePath="..\..\engines\sky\struc.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\text.cpp"
+			RelativePath="..\..\engines\sky\text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sky\text.h"
+			RelativePath="..\..\engines\sky\text.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/sword1.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sword1.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/sword1.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,159 +159,159 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\sword1\animation.cpp"
+			RelativePath="..\..\engines\sword1\animation.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\animation.h"
+			RelativePath="..\..\engines\sword1\animation.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\collision.h"
+			RelativePath="..\..\engines\sword1\collision.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\control.cpp"
+			RelativePath="..\..\engines\sword1\control.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\control.h"
+			RelativePath="..\..\engines\sword1\control.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\credits.cpp"
+			RelativePath="..\..\engines\sword1\credits.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\credits.h"
+			RelativePath="..\..\engines\sword1\credits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\debug.cpp"
+			RelativePath="..\..\engines\sword1\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\debug.h"
+			RelativePath="..\..\engines\sword1\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\eventman.cpp"
+			RelativePath="..\..\engines\sword1\eventman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\eventman.h"
+			RelativePath="..\..\engines\sword1\eventman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\logic.cpp"
+			RelativePath="..\..\engines\sword1\logic.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\logic.h"
+			RelativePath="..\..\engines\sword1\logic.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\memman.cpp"
+			RelativePath="..\..\engines\sword1\memman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\memman.h"
+			RelativePath="..\..\engines\sword1\memman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\menu.cpp"
+			RelativePath="..\..\engines\sword1\menu.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\menu.h"
+			RelativePath="..\..\engines\sword1\menu.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\mouse.cpp"
+			RelativePath="..\..\engines\sword1\mouse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\mouse.h"
+			RelativePath="..\..\engines\sword1\mouse.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\music.cpp"
+			RelativePath="..\..\engines\sword1\music.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\music.h"
+			RelativePath="..\..\engines\sword1\music.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\object.h"
+			RelativePath="..\..\engines\sword1\object.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\objectman.cpp"
+			RelativePath="..\..\engines\sword1\objectman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\objectman.h"
+			RelativePath="..\..\engines\sword1\objectman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\resman.cpp"
+			RelativePath="..\..\engines\sword1\resman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\resman.h"
+			RelativePath="..\..\engines\sword1\resman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\router.cpp"
+			RelativePath="..\..\engines\sword1\router.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\router.h"
+			RelativePath="..\..\engines\sword1\router.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\screen.cpp"
+			RelativePath="..\..\engines\sword1\screen.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\screen.h"
+			RelativePath="..\..\engines\sword1\screen.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\sound.cpp"
+			RelativePath="..\..\engines\sword1\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\sound.h"
+			RelativePath="..\..\engines\sword1\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\staticres.cpp"
+			RelativePath="..\..\engines\sword1\staticres.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\sword1.cpp"
+			RelativePath="..\..\engines\sword1\sword1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\sword1.h"
+			RelativePath="..\..\engines\sword1\sword1.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\sworddefs.h"
+			RelativePath="..\..\engines\sword1\sworddefs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\swordres.h"
+			RelativePath="..\..\engines\sword1\swordres.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\text.cpp"
+			RelativePath="..\..\engines\sword1\text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword1\text.h"
+			RelativePath="..\..\engines\sword1\text.h"
 			>
 		</File>
 	</Files>

Modified: scummvm/trunk/dists/msvc8/sword2.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/sword2.vcproj	2006-02-12 14:05:47 UTC (rev 20614)
+++ scummvm/trunk/dists/msvc8/sword2.vcproj	2006-02-12 14:08:45 UTC (rev 20615)
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -112,7 +112,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="../../;../../common"
+				AdditionalIncludeDirectories="../..;../../engines"
 				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -159,219 +159,219 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\sword2\_mouse.cpp"
+			RelativePath="..\..\engines\sword2\_mouse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\animation.cpp"
+			RelativePath="..\..\engines\sword2\animation.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\animation.h"
+			RelativePath="..\..\engines\sword2\animation.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\anims.cpp"
+			RelativePath="..\..\engines\sword2\anims.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\build_display.cpp"
+			RelativePath="..\..\engines\sword2\build_display.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\build_display.h"
+			RelativePath="..\..\engines\sword2\build_display.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\console.cpp"
+			RelativePath="..\..\engines\sword2\console.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\console.h"
+			RelativePath="..\..\engines\sword2\console.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\controls.cpp"
+			RelativePath="..\..\engines\sword2\controls.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\controls.h"
+			RelativePath="..\..\engines\sword2\controls.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\d_draw.cpp"
+			RelativePath="..\..\engines\sword2\d_draw.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\debug.cpp"
+			RelativePath="..\..\engines\sword2\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\debug.h"
+			RelativePath="..\..\engines\sword2\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\defs.h"
+			RelativePath="..\..\engines\sword2\defs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\events.cpp"
+			RelativePath="..\..\engines\sword2\events.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\function.cpp"
+			RelativePath="..\..\engines\sword2\function.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\header.h"
+			RelativePath="..\..\engines\sword2\header.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\icons.cpp"
+			RelativePath="..\..\engines\sword2\icons.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\icons.h"
+			RelativePath="..\..\engines\sword2\icons.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\interpreter.cpp"
+			RelativePath="..\..\engines\sword2\interpreter.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\interpreter.h"
+			RelativePath="..\..\engines\sword2\interpreter.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\layers.cpp"
+			RelativePath="..\..\engines\sword2\layers.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\layers.h"
+			RelativePath="..\..\engines\sword2\layers.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\logic.cpp"
+			RelativePath="..\..\engines\sword2\logic.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\logic.h"
+			RelativePath="..\..\engines\sword2\logic.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\maketext.cpp"
+			RelativePath="..\..\engines\sword2\maketext.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\maketext.h"
+			RelativePath="..\..\engines\sword2\maketext.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\memory.cpp"
+			RelativePath="..\..\engines\sword2\memory.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\memory.h"
+			RelativePath="..\..\engines\sword2\memory.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\menu.cpp"
+			RelativePath="..\..\engines\sword2\menu.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\mouse.cpp"
+			RelativePath="..\..\engines\sword2\mouse.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\mouse.h"
+			RelativePath="..\..\engines\sword2\mouse.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\music.cpp"
+			RelativePath="..\..\engines\sword2\music.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\object.h"
+			RelativePath="..\..\engines\sword2\object.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\palette.cpp"
+			RelativePath="..\..\engines\sword2\palette.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\protocol.cpp"
+			RelativePath="..\..\engines\sword2\protocol.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\rdwin.cpp"
+			RelativePath="..\..\engines\sword2\rdwin.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\render.cpp"
+			RelativePath="..\..\engines\sword2\render.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\resman.cpp"
+			RelativePath="..\..\engines\sword2\resman.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\resman.h"
+			RelativePath="..\..\engines\sword2\resman.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\router.cpp"
+			RelativePath="..\..\engines\sword2\router.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\router.h"
+			RelativePath="..\..\engines\sword2\router.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\save_rest.cpp"
+			RelativePath="..\..\engines\sword2\save_rest.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\save_rest.h"
+			RelativePath="..\..\engines\sword2\save_rest.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\scroll.cpp"
+			RelativePath="..\..\engines\sword2\scroll.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sound.cpp"
+			RelativePath="..\..\engines\sword2\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sound.h"
+			RelativePath="..\..\engines\sword2\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\speech.cpp"
+			RelativePath="..\..\engines\sword2\speech.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sprite.cpp"
+			RelativePath="..\..\engines\sword2\sprite.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\startup.cpp"
+			RelativePath="..\..\engines\sword2\startup.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sword2.cpp"
+			RelativePath="..\..\engines\sword2\sword2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sword2.h"
+			RelativePath="..\..\engines\sword2\sword2.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\sync.cpp"
+			RelativePath="..\..\engines\sword2\sync.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\sword2\walker.cpp"
+			RelativePath="..\..\engines\sword2\walker.cpp"
 			>
 		</File>
 	</Files>







More information about the Scummvm-git-logs mailing list