From 7232dba7479e01b69df5cee7b8d968bf6e3e21c2 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 15 Apr 2007 14:56:33 +0000
Subject: Applied the patch by thebluegr (bug #1700986)

svn-id: r26504
---
 dists/msvc8/agi.vcproj     |  4 ----
 dists/msvc8/gob.vcproj     | 58 ++++++++++++++++++++++++++--------------------
 dists/msvc8/lure.vcproj    |  8 -------
 dists/msvc8/scumm.vcproj   |  2 +-
 dists/msvc8/scummvm.vcproj |  2 +-
 5 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/dists/msvc8/agi.vcproj b/dists/msvc8/agi.vcproj
index 4f9ea61c3c..c858028554 100644
--- a/dists/msvc8/agi.vcproj
+++ b/dists/msvc8/agi.vcproj
@@ -276,10 +276,6 @@
 			RelativePath="..\..\engines\agi\opcodes.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\agi\patches.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\agi\picture.cpp"
 			>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 09646cd753..8770210a79 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -123,7 +123,7 @@
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -159,14 +159,6 @@
 	<References>
 	</References>
 	<Files>
-		<File
-			RelativePath="..\..\engines\gob\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\anim.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\gob\cdrom.cpp"
 			>
@@ -263,6 +255,18 @@
 			RelativePath="..\..\engines\gob\goblin_v2.cpp"
 			>
 		</File>
+		<File
+			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"
 			>
@@ -299,6 +303,10 @@
 			RelativePath="..\..\engines\gob\inter_v2.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\gob\inter_v3.cpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\engines\gob\map.cpp"
 			>
@@ -339,14 +347,6 @@
 			RelativePath="..\..\engines\gob\music.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\gob\pack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\pack.h"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\gob\palanim.cpp"
 			>
@@ -372,35 +372,43 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
+			RelativePath="..\..\engines\gob\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.h"
+			RelativePath="..\..\engines\gob\saveload.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
+			RelativePath="..\..\engines\gob\saveload_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
+			RelativePath="..\..\engines\gob\saveload_v3.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\sound.cpp"
+			RelativePath="..\..\engines\gob\scenery.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\sound.h"
+			RelativePath="..\..\engines\gob\scenery.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\timer.cpp"
+			RelativePath="..\..\engines\gob\scenery_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\scenery_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\timer.h"
+			RelativePath="..\..\engines\gob\sound.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\sound.h"
 			>
 		</File>
 		<File
diff --git a/dists/msvc8/lure.vcproj b/dists/msvc8/lure.vcproj
index 3668736547..90e2fc964f 100644
--- a/dists/msvc8/lure.vcproj
+++ b/dists/msvc8/lure.vcproj
@@ -330,14 +330,6 @@
 			RelativePath="..\..\engines\lure\surface.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\lure\system.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\system.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index cec931fa29..adfa01be34 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -123,7 +123,7 @@
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index eace1d08a5..ae328d21d1 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -74,7 +74,7 @@
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="2"
+				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
-- 
cgit v1.2.3