Updated the MSVC project files for the SCI engine and the ScummVM common code with the latest changes

svn-id: r39124

8 files changed, 42 insertions, 70 deletions

diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
index 791f7f6deb..f23b96b59e 100644
--- a/dists/msvc7/sci.vcproj
+++ b/dists/msvc7/sci.vcproj
@@ -361,9 +361,6 @@
 				RelativePath="..\..\engines\sci\scicore\sciconsole.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\script.cpp">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\scicore\versions.cpp">
 			</File>
 			<File
@@ -391,15 +388,6 @@
 				RelativePath="..\..\engines\sci\sfx\iterator.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\sfx\sequencer.h">
 			</File>
 			<File
@@ -408,9 +396,6 @@
 			<File
 				RelativePath="..\..\engines\sci\sfx\songlib.cpp">
 			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\time.cpp">
-			</File>
 			<Filter
 				Name="device">
 				<File
@@ -482,6 +467,9 @@
 			RelativePath="..\..\engines\sci\sci_memory.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\engine\script.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 9c0c24d0b5..4de02b3600 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -450,6 +450,12 @@
 				RelativePath="..\..\sound\shorten.h">
 			</File>
 			<File
+				RelativePath="..\..\sound\timestamp.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\timestamp.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\voc.cpp">
 			</File>
 			<File
diff --git a/dists/msvc71/sci.vcproj b/dists/msvc71/sci.vcproj
index 9c2160b5e8..d074ece458 100644
--- a/dists/msvc71/sci.vcproj
+++ b/dists/msvc71/sci.vcproj
@@ -375,9 +375,6 @@
 				RelativePath="..\..\engines\sci\scicore\sciconsole.h">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\script.cpp">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\scicore\versions.cpp">
 			</File>
 			<File
@@ -405,15 +402,6 @@
 				RelativePath="..\..\engines\sci\sfx\iterator.cpp">
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.cpp">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.h">
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp">
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\sfx\sequencer.h">
 			</File>
 			<File
@@ -422,9 +410,6 @@
 			<File
 				RelativePath="..\..\engines\sci\sfx\songlib.cpp">
 			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\time.cpp">
-			</File>
 			<Filter
 				Name="device">
 				<File
@@ -496,6 +481,9 @@
 			RelativePath="..\..\engines\sci\sci_memory.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\engine\script.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 2355061f93..90af88d057 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -464,6 +464,12 @@
 				RelativePath="..\..\sound\shorten.h">
 			</File>
 			<File
+				RelativePath="..\..\sound\timestamp.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\timestamp.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\voc.cpp">
 			</File>
 			<File
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index 6f9dcd7bd0..6a6407220d 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -510,10 +510,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\script.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\scicore\versions.cpp"
 				>
 			</File>
@@ -550,18 +546,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\sfx\sequencer.h"
 				>
 			</File>
@@ -573,10 +557,6 @@
 				RelativePath="..\..\engines\sci\sfx\songlib.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\time.cpp"
-				>
-			</File>
 			<Filter
 				Name="device"
 				>
@@ -671,6 +651,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\engine\script.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index ba60f64fb5..f132871178 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -633,6 +633,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\sound\timestamp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\sound\timestamp.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\sound\voc.cpp"
 				>
 			</File>
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 22258463ac..cf462412ab 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -511,10 +511,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\scicore\script.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\scicore\versions.cpp"
 				>
 			</File>
@@ -551,18 +547,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\mixer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\pcm-iterator.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\engines\sci\sfx\sequencer.h"
 				>
 			</File>
@@ -574,10 +558,6 @@
 				RelativePath="..\..\engines\sci\sfx\songlib.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\engines\sci\sfx\time.cpp"
-				>
-			</File>
 			<Filter
 				Name="device"
 				>
@@ -672,6 +652,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\sci\engine\script.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\sci\tools.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index 92c2b53821..7acc5a466e 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -638,6 +638,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\sound\timestamp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\sound\timestamp.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\sound\voc.cpp"
 				>
 			</File>