- Updated the MSVC project files of ScummVM (added the new Adlib player, as well as vkeyb and keymapper)

- Synced the GOB project files
- Synced the SCUMM project files

svn-id: r40349

8 files changed, 447 insertions, 35 deletions

diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index d5eed1df67..3716266811 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -416,10 +416,10 @@
 			RelativePath="..\..\engines\gob\video_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp">
+			RelativePath="..\..\engines\gob\videoplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.h">
+			RelativePath="..\..\engines\gob\videoplayer.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\demos\batplayer.cpp">
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index df7757dc33..3de74f5b3c 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -610,6 +610,27 @@
 						RelativePath="..\..\sound\softsynth\mt32\tables.h">
 					</File>
 				</Filter>
+				<Filter
+					Name="opl">
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.h">
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="mods">
@@ -782,6 +803,75 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="keymapper">
+				<File
+					RelativePath="..\..\backends\keymapper\action.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\action.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\hardware-key.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\types.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="vkeybd">
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h">
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="gui">
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index 1055959cca..f51786b539 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -430,10 +430,10 @@
 			RelativePath="..\..\engines\gob\video_v6.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.cpp">
+			RelativePath="..\..\engines\gob\videoplayer.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.h">
+			RelativePath="..\..\engines\gob\videoplayer.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\gob\demos\batplayer.cpp">
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 5bd0da74c6..d290334085 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -624,6 +624,27 @@
 						RelativePath="..\..\sound\softsynth\mt32\tables.h">
 					</File>
 				</Filter>
+				<Filter
+					Name="opl">
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.h">
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="mods">
@@ -796,6 +817,75 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="keymapper">
+				<File
+					RelativePath="..\..\backends\keymapper\action.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\action.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\hardware-key.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\types.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="vkeybd">
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp">
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h">
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="gui">
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 877ce2a2b2..ef7a51a840 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -250,34 +250,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="demos"
-			>
-			<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"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\gob\demos\scnplayer.h"
-				>
-			</File>
-		</Filter>
 		<File
 			RelativePath="..\..\engines\gob\coktelvideo.cpp"
 			>
@@ -567,7 +539,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scnplayer.h"
+			RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\demos\scnplayer.h"
 			>
 		</File>
 		<File
@@ -607,11 +583,27 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\videoplayer.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\videoplayer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\videoplayer.h"
+			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"
 			>
 		</File>
 	</Files>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 047c027e89..7b7588b0fd 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="scumm"
 	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
 	RootNamespace="scumm"
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 56e4dce32c..fe49c1023a 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -845,6 +845,34 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="opl"
+					>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="mods"
@@ -1073,6 +1101,98 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="keymapper"
+				>
+				<File
+					RelativePath="..\..\backends\keymapper\action.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\action.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\hardware-key.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\types.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="vkeybd"
+				>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="gui"
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index dc511bdf30..d8450d2594 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -850,6 +850,34 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="opl"
+					>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\dosbox.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\mame.h"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\opl\opl.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="mods"
@@ -1078,6 +1106,98 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="keymapper"
+				>
+				<File
+					RelativePath="..\..\backends\keymapper\action.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\action.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\hardware-key.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\keymapper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\remap-dialog.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\keymapper\types.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="vkeybd"
+				>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\image-map.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\keycode-descriptions.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\polygon.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-gui.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard-parser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\backends\vkeybd\virtual-keyboard.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="gui"