From 043f92cb230f6afc83e5635cc1610c5d166e105f Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Sat, 3 May 2008 13:01:58 +0000
Subject: Fix compilation on MSVC (Updated project files and turned a 'int
forced to bool' warning off).
svn-id: r31840
---
dists/msvc7/drascula.vcproj | 5 +-
dists/msvc7/kyra.vcproj | 94 ++++++++++++++++++++++++--------------
dists/msvc71/drascula.vcproj | 5 +-
dists/msvc71/kyra.vcproj | 94 ++++++++++++++++++++++++--------------
dists/msvc8/drascula.vcproj | 6 ++-
dists/msvc8/kyra.vcproj | 106 ++++++++++++++++++++++++++++---------------
dists/msvc9/drascula.vcproj | 6 ++-
dists/msvc9/kyra.vcproj | 106 ++++++++++++++++++++++++++++---------------
engines/kyra/script_hof.cpp | 2 +-
9 files changed, 275 insertions(+), 149 deletions(-)
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index fe46263499..8a55a1856b 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -112,7 +112,10 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
+ RelativePath="..\..\engines\drascula\talk.cpp">
+
+
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
index 7e5abba0b5..508a2ead73 100644
--- a/dists/msvc7/kyra.vcproj
+++ b/dists/msvc7/kyra.vcproj
@@ -96,6 +96,12 @@
+
+
+
+
@@ -105,9 +111,6 @@
-
-
@@ -142,13 +145,16 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+
+
+ RelativePath="..\..\engines\kyra\items_v2.cpp">
@@ -156,6 +162,18 @@
+
+
+
+
+
+
+
+
@@ -169,31 +187,31 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
+ RelativePath="..\..\engines\kyra\resource.cpp">
+ RelativePath="..\..\engines\kyra\resource.h">
+ RelativePath="..\..\engines\kyra\saveload.cpp">
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
+ RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
@@ -201,15 +219,24 @@
-
-
+
+
+
+
+
+
+
+
@@ -223,16 +250,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
+ RelativePath="..\..\engines\kyra\script.cpp">
+ RelativePath="..\..\engines\kyra\script.h">
+ RelativePath="..\..\engines\kyra\script_hof.cpp">
+ RelativePath="..\..\engines\kyra\script_mr.cpp">
@@ -246,9 +273,6 @@
-
-
@@ -256,13 +280,13 @@
RelativePath="..\..\engines\kyra\seqplayer.h">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
@@ -298,19 +322,19 @@
RelativePath="..\..\engines\kyra\text.h">
+ RelativePath="..\..\engines\kyra\text_hof.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.h">
+ RelativePath="..\..\engines\kyra\text_mr.cpp">
+ RelativePath="..\..\engines\kyra\text_mr.h">
+ RelativePath="..\..\engines\kyra\text_v1.cpp">
@@ -319,13 +343,13 @@
RelativePath="..\..\engines\kyra\timer.h">
+ RelativePath="..\..\engines\kyra\timer_hof.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
+ RelativePath="..\..\engines\kyra\timer_v1.cpp">
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
index e2147f7a87..0d27422515 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -126,7 +126,10 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
+ RelativePath="..\..\engines\drascula\talk.cpp">
+
+
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
index d711e121ea..4fceb15a9d 100644
--- a/dists/msvc71/kyra.vcproj
+++ b/dists/msvc71/kyra.vcproj
@@ -110,6 +110,12 @@
+
+
+
+
@@ -119,9 +125,6 @@
-
-
@@ -156,13 +159,16 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+
+
+ RelativePath="..\..\engines\kyra\items_v2.cpp">
@@ -170,6 +176,18 @@
+
+
+
+
+
+
+
+
@@ -183,31 +201,31 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
+ RelativePath="..\..\engines\kyra\resource.cpp">
+ RelativePath="..\..\engines\kyra\resource.h">
+ RelativePath="..\..\engines\kyra\saveload.cpp">
+ RelativePath="..\..\engines\kyra\saveload_hof.cpp">
+ RelativePath="..\..\engines\kyra\saveload_mr.cpp">
+ RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
@@ -215,15 +233,24 @@
-
-
+
+
+
+
+
+
+
+
@@ -237,16 +264,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
+ RelativePath="..\..\engines\kyra\script.cpp">
+ RelativePath="..\..\engines\kyra\script.h">
+ RelativePath="..\..\engines\kyra\script_hof.cpp">
+ RelativePath="..\..\engines\kyra\script_mr.cpp">
@@ -260,9 +287,6 @@
-
-
@@ -270,13 +294,13 @@
RelativePath="..\..\engines\kyra\seqplayer.h">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
@@ -312,19 +336,19 @@
RelativePath="..\..\engines\kyra\text.h">
+ RelativePath="..\..\engines\kyra\text_hof.cpp">
+ RelativePath="..\..\engines\kyra\text_hof.h">
+ RelativePath="..\..\engines\kyra\text_mr.cpp">
+ RelativePath="..\..\engines\kyra\text_mr.h">
+ RelativePath="..\..\engines\kyra\text_v1.cpp">
@@ -333,13 +357,13 @@
RelativePath="..\..\engines\kyra\timer.h">
+ RelativePath="..\..\engines\kyra\timer_hof.cpp">
+ RelativePath="..\..\engines\kyra\timer_mr.cpp">
+ RelativePath="..\..\engines\kyra\timer_v1.cpp">
diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index f90684c535..7cf6065a4f 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -181,7 +181,11 @@
>
+
+
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index be73de0e5d..cbd876a19e 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -161,19 +161,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -257,23 +281,23 @@
>
+
+
+
+
+
+
-
-
@@ -373,15 +405,15 @@
>
+
+
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index d057cb5df2..6b198f4094 100644
--- a/dists/msvc9/kyra.vcproj
+++ b/dists/msvc9/kyra.vcproj
@@ -162,19 +162,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -258,23 +282,23 @@
>
+
+
+
+
+
+
-
-
@@ -374,15 +406,15 @@
>