aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dists/msvc7/gob.vcproj39
-rw-r--r--dists/msvc7/sci.vcproj3
-rw-r--r--dists/msvc7/scummvm.vcproj18
-rw-r--r--dists/msvc71/gob.vcproj39
-rw-r--r--dists/msvc71/sci.vcproj3
-rw-r--r--dists/msvc71/scummvm.vcproj18
-rw-r--r--dists/msvc8/gob.vcproj50
-rw-r--r--dists/msvc8/sci.vcproj4
-rw-r--r--dists/msvc8/scummvm.vcproj24
-rw-r--r--dists/msvc9/gob.vcproj50
-rw-r--r--dists/msvc9/sci.vcproj4
-rw-r--r--dists/msvc9/scummvm.vcproj24
12 files changed, 152 insertions, 124 deletions
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 3716266811..fe5443ff99 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -167,10 +167,10 @@
</File>
</Filter>
<File
- RelativePath="..\..\engines\gob\coktelvideo.cpp">
+ RelativePath="..\..\engines\gob\demos\batplayer.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\coktelvideo.h">
+ RelativePath="..\..\engines\gob\demos\batplayer.h">
</File>
<File
RelativePath="..\..\engines\gob\dataio.cpp">
@@ -179,6 +179,12 @@
RelativePath="..\..\engines\gob\dataio.h">
</File>
<File
+ RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\gob\demos\demoplayer.h">
+ </File>
+ <File
RelativePath="..\..\engines\gob\detection.cpp">
</File>
<File
@@ -212,6 +218,9 @@
RelativePath="..\..\engines\gob\game.h">
</File>
<File
+ RelativePath="..\..\engines\gob\game_fascin.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\game_v1.cpp">
</File>
<File
@@ -221,9 +230,6 @@
RelativePath="..\..\engines\gob\game_v6.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\game_fascin.cpp">
- </File>
- <File
RelativePath="..\..\engines\gob\global.cpp">
</File>
<File
@@ -254,15 +260,6 @@
RelativePath="..\..\engines\gob\goblin_v4.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\indeo3.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3.h">
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3data.h">
- </File>
- <File
RelativePath="..\..\engines\gob\init.cpp">
</File>
<File
@@ -416,22 +413,10 @@
RelativePath="..\..\engines\gob\video_v6.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\videoplayer.h">
- </File>
- <File
RelativePath="..\..\engines\gob\videoplayer.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\demos\batplayer.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\batplayer.h">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.h">
+ RelativePath="..\..\engines\gob\videoplayer.h">
</File>
</Files>
<Globals>
diff --git a/dists/msvc7/sci.vcproj b/dists/msvc7/sci.vcproj
index 834053854c..d0ae2097d5 100644
--- a/dists/msvc7/sci.vcproj
+++ b/dists/msvc7/sci.vcproj
@@ -157,6 +157,9 @@
RelativePath="..\..\engines\sci\engine\kmenu.cpp">
</File>
<File
+ RelativePath="..\..\engines\sci\engine\kmisc.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\sci\engine\kmovement.cpp">
</File>
<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 1f6a14a3d0..465f7aa59a 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -1243,6 +1243,24 @@
<File
RelativePath="..\..\graphics\video\video_player.h">
</File>
+ <Filter
+ Name="coktelvideo">
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.h">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h">
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index f51786b539..18bdc868c8 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -181,10 +181,10 @@
</File>
</Filter>
<File
- RelativePath="..\..\engines\gob\coktelvideo.cpp">
+ RelativePath="..\..\engines\gob\demos\batplayer.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\coktelvideo.h">
+ RelativePath="..\..\engines\gob\demos\batplayer.h">
</File>
<File
RelativePath="..\..\engines\gob\dataio.cpp">
@@ -193,6 +193,12 @@
RelativePath="..\..\engines\gob\dataio.h">
</File>
<File
+ RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\gob\demos\demoplayer.h">
+ </File>
+ <File
RelativePath="..\..\engines\gob\detection.cpp">
</File>
<File
@@ -226,6 +232,9 @@
RelativePath="..\..\engines\gob\game.h">
</File>
<File
+ RelativePath="..\..\engines\gob\game_fascin.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\game_v1.cpp">
</File>
<File
@@ -235,9 +244,6 @@
RelativePath="..\..\engines\gob\game_v6.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\game_fascin.cpp">
- </File>
- <File
RelativePath="..\..\engines\gob\global.cpp">
</File>
<File
@@ -268,15 +274,6 @@
RelativePath="..\..\engines\gob\goblin_v4.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\indeo3.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3.h">
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3data.h">
- </File>
- <File
RelativePath="..\..\engines\gob\init.cpp">
</File>
<File
@@ -430,22 +427,10 @@
RelativePath="..\..\engines\gob\video_v6.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\videoplayer.h">
- </File>
- <File
RelativePath="..\..\engines\gob\videoplayer.cpp">
</File>
<File
- RelativePath="..\..\engines\gob\demos\batplayer.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\batplayer.h">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.cpp">
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.h">
+ RelativePath="..\..\engines\gob\videoplayer.h">
</File>
</Files>
<Globals>
diff --git a/dists/msvc71/sci.vcproj b/dists/msvc71/sci.vcproj
index 25e371664b..fab4d03cdb 100644
--- a/dists/msvc71/sci.vcproj
+++ b/dists/msvc71/sci.vcproj
@@ -171,6 +171,9 @@
RelativePath="..\..\engines\sci\engine\kmenu.cpp">
</File>
<File
+ RelativePath="..\..\engines\sci\engine\kmisc.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\sci\engine\kmovement.cpp">
</File>
<File
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 88bc37dfca..7ed5fc5993 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -1257,6 +1257,24 @@
<File
RelativePath="..\..\graphics\video\video_player.h">
</File>
+ <Filter
+ Name="coktelvideo">
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.h">
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h">
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index ef7a51a840..6950d3835e 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -251,11 +251,11 @@
</File>
</Filter>
<File
- RelativePath="..\..\engines\gob\coktelvideo.cpp"
+ RelativePath="..\..\engines\gob\demos\batplayer.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\coktelvideo.h"
+ RelativePath="..\..\engines\gob\demos\batplayer.h"
>
</File>
<File
@@ -267,6 +267,14 @@
>
</File>
<File
+ RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\gob\demos\demoplayer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\gob\detection.cpp"
>
</File>
@@ -311,19 +319,19 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v1.cpp"
+ RelativePath="..\..\engines\gob\game_fascin.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v2.cpp"
+ RelativePath="..\..\engines\gob\game_v1.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v6.cpp"
+ RelativePath="..\..\engines\gob\game_v2.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_fascin.cpp"
+ RelativePath="..\..\engines\gob\game_v6.cpp"
>
</File>
<File
@@ -367,18 +375,6 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\indeo3.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3.h"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3data.h"
- >
- </File>
- <File
RelativePath="..\..\engines\gob\init.cpp"
>
</File>
@@ -583,27 +579,11 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\videoplayer.h"
- >
- </File>
- <File
RelativePath="..\..\engines\gob\videoplayer.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\demos\batplayer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\batplayer.h"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.h"
+ RelativePath="..\..\engines\gob\videoplayer.h"
>
</File>
</Files>
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj
index a505e46a9e..91092e2af8 100644
--- a/dists/msvc8/sci.vcproj
+++ b/dists/msvc8/sci.vcproj
@@ -238,6 +238,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\sci\engine\kmisc.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\sci\engine\kmovement.cpp"
>
</File>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 04098e02f8..bf13641015 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -1687,6 +1687,30 @@
RelativePath="..\..\graphics\video\video_player.h"
>
</File>
+ <Filter
+ Name="coktelvideo"
+ >
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index 747f03f14d..7902441e30 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -252,11 +252,11 @@
</File>
</Filter>
<File
- RelativePath="..\..\engines\gob\coktelvideo.cpp"
+ RelativePath="..\..\engines\gob\demos\batplayer.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\coktelvideo.h"
+ RelativePath="..\..\engines\gob\demos\batplayer.h"
>
</File>
<File
@@ -268,6 +268,14 @@
>
</File>
<File
+ RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\gob\demos\demoplayer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\gob\detection.cpp"
>
</File>
@@ -312,19 +320,19 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v1.cpp"
+ RelativePath="..\..\engines\gob\game_fascin.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v2.cpp"
+ RelativePath="..\..\engines\gob\game_v1.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_v6.cpp"
+ RelativePath="..\..\engines\gob\game_v2.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\game_fascin.cpp"
+ RelativePath="..\..\engines\gob\game_v6.cpp"
>
</File>
<File
@@ -368,18 +376,6 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\indeo3.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3.h"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\indeo3data.h"
- >
- </File>
- <File
RelativePath="..\..\engines\gob\init.cpp"
>
</File>
@@ -584,27 +580,11 @@
>
</File>
<File
- RelativePath="..\..\engines\gob\videoplayer.h"
- >
- </File>
- <File
RelativePath="..\..\engines\gob\videoplayer.cpp"
>
</File>
<File
- RelativePath="..\..\engines\gob\demos\batplayer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\batplayer.h"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.cpp"
- >
- </File>
- <File
- RelativePath="..\..\engines\gob\demos\demoplayer.h"
+ RelativePath="..\..\engines\gob\videoplayer.h"
>
</File>
</Files>
diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj
index 5f5368b74b..12ee141ea7 100644
--- a/dists/msvc9/sci.vcproj
+++ b/dists/msvc9/sci.vcproj
@@ -239,6 +239,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\sci\engine\kmisc.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\sci\engine\kmovement.cpp"
>
</File>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index 934b0af21e..bd5444f8e9 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -1692,6 +1692,30 @@
RelativePath="..\..\graphics\video\video_player.h"
>
</File>
+ <Filter
+ Name="coktelvideo"
+ >
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\coktelvideo.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\graphics\video\coktelvideo\indeo3data.h"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter