[Scummvm-cvs-logs] SF.net SVN: scummvm:[40349] scummvm/trunk/dists

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed May 6 12:01:05 CEST 2009


Revision: 40349
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40349&view=rev
Author:   thebluegr
Date:     2009-05-06 10:01:05 +0000 (Wed, 06 May 2009)

Log Message:
-----------
- 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

Modified Paths:
--------------
    scummvm/trunk/dists/msvc7/gob.vcproj
    scummvm/trunk/dists/msvc7/scummvm.vcproj
    scummvm/trunk/dists/msvc71/gob.vcproj
    scummvm/trunk/dists/msvc71/scummvm.vcproj
    scummvm/trunk/dists/msvc8/gob.vcproj
    scummvm/trunk/dists/msvc8/scumm.vcproj
    scummvm/trunk/dists/msvc8/scummvm.vcproj
    scummvm/trunk/dists/msvc9/scummvm.vcproj

Modified: scummvm/trunk/dists/msvc7/gob.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/gob.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc7/gob.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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">

Modified: scummvm/trunk/dists/msvc7/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc7/scummvm.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc7/scummvm.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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">

Modified: scummvm/trunk/dists/msvc71/gob.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/gob.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc71/gob.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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">

Modified: scummvm/trunk/dists/msvc71/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc71/scummvm.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc71/scummvm.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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">

Modified: scummvm/trunk/dists/msvc8/gob.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/gob.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc8/gob.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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,10 +539,14 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scnplayer.h"
+			RelativePath="..\..\engines\gob\demos\scnplayer.cpp"
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\demos\scnplayer.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\util.cpp"
 			>
 		</File>
@@ -607,13 +583,29 @@
 			>
 		</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>
 	<Globals>
 	</Globals>

Modified: scummvm/trunk/dists/msvc8/scumm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scumm.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc8/scumm.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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"

Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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"

Modified: scummvm/trunk/dists/msvc9/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc9/scummvm.vcproj	2009-05-06 09:31:55 UTC (rev 40348)
+++ scummvm/trunk/dists/msvc9/scummvm.vcproj	2009-05-06 10:01:05 UTC (rev 40349)
@@ -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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list