update

svn-id: r16344

6 files changed, 206 insertions, 444 deletions

diff --git a/dists/msvc8/saga.vcproj b/dists/msvc8/saga.vcproj
index 67b49e384b..cb97efc45d 100644
--- a/dists/msvc8/saga.vcproj
+++ b/dists/msvc8/saga.vcproj
@@ -199,18 +199,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\cvar.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\saga\cvar.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\saga\cvar_mod.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\saga\events.cpp"
 			>
 		</File>
@@ -219,14 +207,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\expr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\saga\expr.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\saga\font.cpp"
 			>
 		</File>
@@ -247,10 +227,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\game_mod.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\saga\gfx.cpp"
 			>
 		</File>
@@ -295,6 +271,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\saga\list.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\saga\music.cpp"
 			>
 		</File>
@@ -327,10 +307,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\reinherit.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\saga\render.cpp"
 			>
 		</File>
@@ -379,14 +355,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\sdata.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\saga\sdata.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\saga\sdebug.cpp"
 			>
 		</File>
@@ -423,23 +391,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\text.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\saga\text.h"
+			RelativePath="..\..\saga\stream.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\transitions.cpp"
+			RelativePath="..\..\saga\text.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\ys_dl_list.cpp"
+			RelativePath="..\..\saga\text.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\saga\yslib.h"
+			RelativePath="..\..\saga\transitions.cpp"
 			>
 		</File>
 	</Files>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 5d95b3c102..bff054e8d6 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -624,6 +624,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\scumm\util.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\scumm\util.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\scumm\vars.cpp"
 			>
 		</File>
@@ -635,6 +643,14 @@
 			RelativePath="..\..\scumm\verbs.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\scumm\wiz_he.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\scumm\wiz_he.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 7fa19df5e2..8723552144 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -544,6 +544,156 @@
 				RelativePath="..\..\sound\vorbis.h"
 				>
 			</File>
+			<Filter
+				Name="softhsynth"
+				>
+				<File
+					RelativePath="..\..\sound\softsynth\adlib.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\emumidi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\mt32.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\ym2612.cpp"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"
+							XMLDocumentationFileName="$(IntDir)/$(InputName)1.xdc"
+						/>
+					</FileConfiguration>
+				</File>
+				<Filter
+					Name="mt32"
+					>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\i386.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\i386.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\part.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\part.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partial.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partial.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\structures.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\synth.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\synth.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\tables.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\tables.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="txt"
@@ -625,14 +775,6 @@
 				Name="midi"
 				>
 				<File
-					RelativePath="..\..\backends\midi\adlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\backends\midi\mt32.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\backends\midi\null.cpp"
 					>
 				</File>
@@ -640,86 +782,6 @@
 					RelativePath="..\..\backends\midi\windows.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\backends\midi\ym2612.cpp"
-					>
-				</File>
-				<Filter
-					Name="mt32"
-					>
-					<File
-						RelativePath="..\..\backends\midi\mt32\freeverb.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\freeverb.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\i386.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\i386.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32_file.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32_file.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32emu.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\part.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\part.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partial.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partial.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partialManager.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partialManager.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\structures.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\synth.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\synth.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\tables.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\tables.h"
-						>
-					</File>
-				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
@@ -762,6 +824,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\credits.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\dialog.cpp"
 				>
 			</File>
@@ -886,6 +952,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\graphics\surface.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\graphics\surface.h"
 				>
 			</File>
diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj
index 1618b85747..e26b4e3eca 100644
--- a/dists/msvc8/simon.vcproj
+++ b/dists/msvc8/simon.vcproj
@@ -164,6 +164,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\simon\cursor.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\simon\debug.cpp"
 			>
 		</File>
@@ -180,6 +184,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\simon\icons.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\simon\intern.h"
 			>
 		</File>
@@ -204,6 +212,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\simon\saveload.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\simon\simon-md5.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\simon\simon.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/sky.vcproj b/dists/msvc8/sky.vcproj
index 40cda3cc73..40d92fd9f6 100644
--- a/dists/msvc8/sky.vcproj
+++ b/dists/msvc8/sky.vcproj
@@ -211,318 +211,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="compacts"
-			>
-			<File
-				RelativePath="..\..\sky\compacts\0compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\101comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\102comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\10comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\11comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\12comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\13comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\14comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\15comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\16comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\17comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\18comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\19comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\1compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\20comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\21comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\22comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\23comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\24comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\25comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\26comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\27comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\28comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\29comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\2compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\30comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\31comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\32comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\33comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\34comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\36comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\37comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\38comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\39comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\3compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\40comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\41comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\42comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\44comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\45comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\46comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\47comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\48comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\4compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\5compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\65comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\66comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\67comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\68comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\69comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\70comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\71comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\72comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\73comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\74comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\75comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\76comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\77comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\78comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\79comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\80comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\81comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\82comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\85comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\90comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\91comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\92comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\93comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\94comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\95comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\96comp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\9compact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\linc_gen.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\lincmenu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\objects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\savedata.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sky\compacts\z_compac.h"
-				>
-			</File>
-		</Filter>
 		<File
 			RelativePath="..\..\sky\autoroute.cpp"
 			>
diff --git a/dists/msvc8/sword1.vcproj b/dists/msvc8/sword1.vcproj
index 8198989467..64ed58df2d 100644
--- a/dists/msvc8/sword1.vcproj
+++ b/dists/msvc8/sword1.vcproj
@@ -179,6 +179,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\sword1\credits.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\sword1\credits.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\sword1\debug.cpp"
 			>
 		</File>