Patch #1825403: "More MSVC7.1 (.NET 2003) project file updates"

svn-id: r29405

10 files changed, 185 insertions, 50 deletions

diff --git a/dists/msvc71/agi.vcproj b/dists/msvc71/agi.vcproj
index a738eea3fa..dd747a6ed7 100644
--- a/dists/msvc71/agi.vcproj
+++ b/dists/msvc71/agi.vcproj
@@ -117,12 +117,6 @@
 			RelativePath="..\..\engines\agi\agi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\agi_v2.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\agi\agi_v3.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\agi\checks.cpp">
 		</File>
 		<File
@@ -162,6 +156,12 @@
 			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
@@ -204,6 +204,36 @@
 			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
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
index 884ab8ccd6..9d6f704017 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -119,6 +119,9 @@
 		<File
 			RelativePath="..\..\engines\drascula\drascula.h">
 		</File>
+		<File
+			RelativePath="..\..\engines\drascula\texts.h">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index b506a9532d..f6b7941d12 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -116,6 +116,12 @@
 			RelativePath="..\..\engines\gob\cdrom.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\coktelvideo.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\coktelvideo.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\dataio.cpp">
 		</File>
 		<File
@@ -185,12 +191,6 @@
 			RelativePath="..\..\engines\gob\goblin_v3.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\imd.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\imd.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\init.cpp">
 		</File>
 		<File
@@ -224,6 +224,9 @@
 			RelativePath="..\..\engines\gob\inter_v3.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\inter_v4.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\map.cpp">
 		</File>
 		<File
@@ -236,6 +239,9 @@
 			RelativePath="..\..\engines\gob\map_v2.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\map_v4.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\mult.cpp">
 		</File>
 		<File
@@ -319,6 +325,12 @@
 		<File
 			RelativePath="..\..\engines\gob\video_v2.cpp">
 		</File>
+		<File
+			RelativePath="..\..\engines\gob\videoplayer.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\videoplayer.h">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
index d1e9a33392..e309a5baeb 100644
--- a/dists/msvc71/kyra.vcproj
+++ b/dists/msvc71/kyra.vcproj
@@ -110,10 +110,13 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\kyra\animator.cpp">
+			RelativePath="..\..\engines\kyra\animator_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator.h">
+			RelativePath="..\..\engines\kyra\animator_v1.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\animator_v2.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\debugger.cpp">
@@ -125,10 +128,16 @@
 			RelativePath="..\..\engines\kyra\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui.cpp">
+			RelativePath="..\..\engines\kyra\gui_v1.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items.cpp">
+			RelativePath="..\..\engines\kyra\gui_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\items_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\items_v2.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\kyra.cpp">
@@ -161,18 +170,36 @@
 			RelativePath="..\..\engines\kyra\resource.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp">
+			RelativePath="..\..\engines\kyra\saveload_v1.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\scene.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_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_v1.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
@@ -182,6 +209,9 @@
 			RelativePath="..\..\engines\kyra\script_v1.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\script_v2.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp">
 		</File>
 		<File
@@ -209,6 +239,9 @@
 			RelativePath="..\..\engines\kyra\sound_towns.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\sound_v1.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\sprites.cpp">
 		</File>
 		<File
@@ -224,9 +257,30 @@
 			RelativePath="..\..\engines\kyra\text.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\text_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\text_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\text_v2.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\timer.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\timer.h">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\timer_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\timer_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\util.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\vqa.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj
index ece38c72ca..c4a4567552 100644
--- a/dists/msvc71/parallaction.vcproj
+++ b/dists/msvc71/parallaction.vcproj
@@ -111,40 +111,40 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\parallaction\animation.cpp">
+			RelativePath="..\..\engines\parallaction\callables_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\archive.cpp">
+			RelativePath="..\..\engines\parallaction\callables_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\callables.cpp">
+			RelativePath="..\..\engines\parallaction\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\commands.cpp">
+			RelativePath="..\..\engines\parallaction\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\commands.h">
+			RelativePath="..\..\engines\parallaction\defs.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\debug.cpp">
+			RelativePath="..\..\engines\parallaction\detection.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\debug.h">
+			RelativePath="..\..\engines\parallaction\dialogue.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\defs.h">
+			RelativePath="..\..\engines\parallaction\disk.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\detection.cpp">
+			RelativePath="..\..\engines\parallaction\disk_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\dialogue.cpp">
+			RelativePath="..\..\engines\parallaction\disk_ns.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp">
+			RelativePath="..\..\engines\parallaction\exec_br.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk.h">
+			RelativePath="..\..\engines\parallaction\exec_ns.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\parallaction\font.cpp">
@@ -156,7 +156,7 @@
 			RelativePath="..\..\engines\parallaction\graphics.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\intro.cpp">
+			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\parallaction\inventory.cpp">
@@ -165,13 +165,10 @@
 			RelativePath="..\..\engines\parallaction\inventory.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\location.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\menu.cpp">
+			RelativePath="..\..\engines\parallaction\objects.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\menu.h">
+			RelativePath="..\..\engines\parallaction\objects.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\parallaction\parallaction.cpp">
@@ -180,12 +177,24 @@
 			RelativePath="..\..\engines\parallaction\parallaction.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\parallaction_br.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\parser.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\parallaction\parser.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\parser_br.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\parser_ns.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\saveload.cpp">
 		</File>
 		<File
@@ -203,12 +212,6 @@
 		<File
 			RelativePath="..\..\engines\parallaction\walk.h">
 		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\zone.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\parallaction\zone.h">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc71/saga.vcproj b/dists/msvc71/saga.vcproj
index 44c72c04b0..fa34802444 100644
--- a/dists/msvc71/saga.vcproj
+++ b/dists/msvc71/saga.vcproj
@@ -116,6 +116,9 @@
 			RelativePath="..\..\engines\saga\actor.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\saga\actor_walk.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\saga\animation.cpp">
 		</File>
 		<File
@@ -274,9 +277,6 @@
 		<File
 			RelativePath="..\..\engines\saga\sthread.cpp">
 		</File>
-		<File
-			RelativePath="..\..\engines\saga\stream.h">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc71/scumm.vcproj b/dists/msvc71/scumm.vcproj
index e47aa63a18..ae8a936c19 100644
--- a/dists/msvc71/scumm.vcproj
+++ b/dists/msvc71/scumm.vcproj
@@ -411,6 +411,12 @@
 			RelativePath="..\..\engines\scumm\file.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\scumm\file_nes.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\scumm\file_nes.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\scumm\gfx.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/scummvm.sln b/dists/msvc71/scummvm.sln
index 8a5830982a..75b31db7ea 100644
--- a/dists/msvc71/scummvm.sln
+++ b/dists/msvc71/scummvm.sln
@@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj",
 		{DC5BD27A-EC3A-4807-9908-0AC6C019BAE4} = {DC5BD27A-EC3A-4807-9908-0AC6C019BAE4}
 		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
 		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
+		{83945CAF-87A0-4202-8BA4-87A0CB15D78A} = {83945CAF-87A0-4202-8BA4-87A0CB15D78A}
 		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
 		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
 		{15DF71E6-ECA9-45ED-8049-1CD7C987CCFE} = {15DF71E6-ECA9-45ED-8049-1CD7C987CCFE}
@@ -83,6 +84,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drascula", "drascula.vcproj
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "igor", "igor.vcproj", "{83945CAF-87A0-4202-8BA4-87A0CB15D78A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -159,6 +164,10 @@ Global
 		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug.Build.0 = Debug|Win32
 		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release.ActiveCfg = Release|Win32
 		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release.Build.0 = Release|Win32
+		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug.ActiveCfg = Debug|Win32
+		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Debug.Build.0 = Debug|Win32
+		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release.ActiveCfg = Release|Win32
+		{83945CAF-87A0-4202-8BA4-87A0CB15D78A}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 0d3238d627..dfadf42ef0 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -202,6 +202,9 @@
 				RelativePath="..\..\common\endian.h">
 			</File>
 			<File
+				RelativePath="..\..\common\error.h">
+			</File>
+			<File
 				RelativePath="..\..\common\events.h">
 			</File>
 			<File
@@ -575,10 +578,10 @@
 				Name="fs"
 				Filter="">
 				<File
-					RelativePath="..\..\backends\fs\abstract-fs.h">
+					RelativePath="..\..\backends\fs\abstract-fs-factory.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\fs\windows\windows-fs.cpp">
+					RelativePath="..\..\backends\fs\abstract-fs-factory.h">
 				</File>
 			</Filter>
 			<Filter
@@ -608,11 +611,26 @@
 					RelativePath="..\..\backends\platform\sdl\graphics.cpp">
 				</File>
 				<File
-					RelativePath="..\..\backends\platform\sdl\sdl-common.h">
+					RelativePath="..\..\backends\platform\sdl\main.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\..\backends\platform\sdl\sdl.cpp">
 				</File>
+				<File
+					RelativePath="..\..\backends\platform\sdl\sdl.h">
+				</File>
 			</Filter>
 			<Filter
 				Name="saves"
diff --git a/dists/msvc71/touche.vcproj b/dists/msvc71/touche.vcproj
index 5cd7de5391..93797bedf1 100644
--- a/dists/msvc71/touche.vcproj
+++ b/dists/msvc71/touche.vcproj
@@ -119,6 +119,9 @@
 			RelativePath="..\..\engines\touche\graphics.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\touche\menu.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\touche\midi.cpp">
 		</File>
 		<File
@@ -142,9 +145,6 @@
 		<File
 			RelativePath="..\..\engines\touche\touche.h">
 		</File>
-		<File
-			RelativePath="..\..\engines\touche\ui.cpp">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>