Use relative include paths to easy some ports.

svn-id: r4005

12 files changed, 64 insertions, 46 deletions

diff --git a/debug.cpp b/debug.cpp
index 8d9121b969..4116086eb3 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -43,7 +43,7 @@ enum {
 	CMD_LOAD_ROOM,
 	CMD_DUMPBOX,
 	CMD_VAR,
-	CMD_WATCH,
+	CMD_WATCH,	
 	CMD_EXIT
 };
 
@@ -152,6 +152,7 @@ bool ScummDebugger::do_command()
 			printf("Var[%d] = %d\n", var, _s->readVar(var));
 		}
 		return true;
+
 	case CMD_WATCH:
 		if (!_parameters[0]) {
 			printf("Clearing all watches..\n");
diff --git a/gameDetector.cpp b/gameDetector.cpp
index 11310c7489..f764aea0c4 100644
--- a/gameDetector.cpp
+++ b/gameDetector.cpp
@@ -23,9 +23,10 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "mididrv.h"
+#include "sound/mididrv.h"
+#include "sound/imuse.h"
 #include "gameDetector.h"
-#include "imuse.h"
+
 
 
 static const char USAGE_STRING[] = 
diff --git a/gui.cpp b/gui.cpp
index ab5eae6a46..790000ff51 100644
--- a/gui.cpp
+++ b/gui.cpp
@@ -21,10 +21,10 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "mididrv.h"
+#include "sound/mididrv.h"
+#include "sound/imuse.h"
 #include "gui.h"
 #include "guimaps.h"
-#include "imuse.h"
 
 #ifdef _WIN32_WCE
 // Additional variables for Win32 specific GUI
diff --git a/readme.txt b/readme.txt
index 12f2c564e3..ad5f6965c8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -20,7 +20,7 @@ that saved games can, and probably will, be incompatible between releases.
 Also ScummVM is capable of playing several non-SCUMM games, at the moment
 this includes Simon The Sorcerer.
 
-If you enjoy ScummVM feel free to donates using the PayPal button on the
+If you enjoy ScummVM feel free to donate using the PayPal button on the
 ScummVM homepage.
 
 
@@ -92,12 +92,8 @@ listed here, nor in the compatibility table on the website, please see below.
 
        Sam and Max:
                 - Subgames are not fully functional.
-                - Game may freeze if you look at the Dragon Heart, or trip
-                  an alarm, at Bumpusville
                 - Some overlap may occur in graphics, expecially the intro
-                - Music does not work in adlib mode, use midi
-                - The dark-light torch does not work in the Tunnel of Love.
-                  You'll have to guess where to throw :)
+                - Music isn't perfect. Some overlap may occur
 
        Loom (256 Talkie):
                 - CD music and voices are not totally syncronised
@@ -141,50 +137,44 @@ found in the 'tools' CVS module, or in the 'scummvm-tools' package.
 
 	Microsoft Visual C++:
 	* Open the workspace, scummwm.dsw
-	* If you want to compile the GDI version, remove sdl.cpp from the
-	  project and add windows.cpp. for the SDL version, remove
-	  windows.cpp from the project and add sdl.cpp.
 	* Enter the path to the SDL include files in Tools|Options|Directories
 	* Now it should compile successfully.
 
         BeOS:
         * Open the 'scummvm.proj' file in BeIDE. Compile as normal.
 
-      
+        PocketPC - Windows CE:
+        * Download the SDLAudio library:
+          http://arisme.free.fr/PocketScumm/sources/SDLAudio-1.2.3-src.zip
+        * Open and compile the SDLAudio WCEBuild/WCEBuild workspace in EVC++
+        * Open the ScummVM wince/PocketScumm workspace
+        * Enter the SDLAudio directory to your includes path
+        * Enter the compiled SDLAudio.lib to your link libraries list
+        * Now it should compile successfully
+
+
 Running:
 --------
 
 Before you run the engine, you need to put the game's datafiles in a
 directory. The filenames must be in lowercase on *nix systems
 (monkey2.000 and monkey2.001). If you use a game with speech, the file
-monster.sou must reside in the same directory as scummvm.
-
-You can either place the scummvm executable in directory in your path,
-or place it one dir up from the games install dir.
-Here is a good example installation directory structure.
+monster.sou must reside in the same directory as the datafiles.
 
-<root>/Games/LucasArts/
-|
-+-- scummvm
-|
-+-- momkey/
-|
-+-- samnmax/
-
-In this installation, <root> is either C: for Windows user, or /usr/
-for *nix systems. To run Monkey Island from this install as a Windows user
-you would make a shortcut with this command:
+For example, to run a copy of Monkey Island installed in C:\Games\LucasArts
+under Windows, you would make a shortcut calling this command:
 
   C:\Games\LucasArts\scummvm.exe -f -pC:\Games\LucasArts\monkey\ monkey
 
-Or, if you have, for example, Full Throttle on CD, and you CD drive is D:,
+Or, if you have, for example, Full Throttle on CD, and your CD drive is D:,
 and you wish to disable subtitles and run in fullscreen:
 
   C:\Games\LucasArts\scummvm.exe -f -n -pD:\resource\ ft
 
 The short game name you see at the end of the command line is very
-important. You can get the current list of games and game names at:
-http://scummvm.sourceforge.net/compatibility.php
+important. A short list is contained at the top of this file. You can also
+get the current list of games and game names at:
+        http://scummvm.sourceforge.net/compatibility.php
 
 For the adventurous, who like to live on the edge... you can download daily
 builds of Win32, Redhat, Debian and other packages here:
@@ -209,7 +199,7 @@ Command Line Options:
 	-f        - Full-screen mode.
         -n        - Disable subtitles. Use with games that have voice.
         -r        - Enable Roland conversion. Try if music sounds incorrect.
-
+        -a        - Enable amiga pal conversion, for playing Amiga versions
 
 In game Hot Keys:
 -----------------
diff --git a/saveload.cpp b/saveload.cpp
index 2d06413fc3..b675116744 100644
--- a/saveload.cpp
+++ b/saveload.cpp
@@ -22,8 +22,8 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "mididrv.h"
-#include "imuse.h"
+#include "sound/mididrv.h"
+#include "sound/imuse.h"
 
 #ifdef _WIN32_WCE
 #define _MANAGE_OLD_SAVE
diff --git a/scumm.h b/scumm.h
index 9b08da3424..ce5faf5448 100644
--- a/scumm.h
+++ b/scumm.h
@@ -21,7 +21,7 @@
 
 #include "scummsys.h"
 #include "system.h"
-#include "mixer.h"
+#include "sound/mixer.h"
 
 #define SCUMMVM_VERSION "0.2.0 devel"
 #define SCUMMVM_CVS "031402"
diff --git a/simon/midi.cpp b/simon/midi.cpp
index a83ed65707..c4acc1390a 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -23,8 +23,8 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#include "mididrv.h"
-#include "mixer.h"
+#include "../sound/mididrv.h"
+#include "../sound/mixer.h"
 #include "simon.h"
 
 void MidiPlayer::read_from_file(void *dst, uint size) {
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 460ff54b2f..f0890e600f 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -23,7 +23,7 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#include "mixer.h"
+#include "../sound/mixer.h"
 #include "simon.h"
 
 
diff --git a/simon/simonsys.cpp b/simon/simonsys.cpp
index 2916d57137..cb7f34bc9e 100644
--- a/simon/simonsys.cpp
+++ b/simon/simonsys.cpp
@@ -23,7 +23,7 @@
 #include "stdafx.h"
 #include "scummsys.h"
 #include "system.h"
-#include "mixer.h"
+#include "../sound/mixer.h"
 #include "simon.h"
 
 #include <stdarg.h>
diff --git a/sound.cpp b/sound.cpp
index 7d2dae28d1..d43202d528 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -22,8 +22,8 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "mididrv.h"
-#include "imuse.h"
+#include "sound/mididrv.h"
+#include "sound/imuse.h"
 
 #ifdef _WIN32_WCE
 extern void *bsearch(const void *, const void *, size_t,
diff --git a/wince/PocketSCUMM.vcc b/wince/PocketSCUMM.vcc
index 27f3c70eaf..2fff553954 100755
--- a/wince/PocketSCUMM.vcc
+++ b/wince/PocketSCUMM.vcc
@@ -10,9 +10,11 @@ LastPage=0
 
 ClassCount=0
 
-ResourceCount=2
+ResourceCount=4
 Resource1=IDD_GAMESELECT (English (U.S.))
 Resource2=IDM_MENU (English (U.S.))
+Resource3=IDD_GAMESELECT
+Resource4=IDM_MENU
 
 [DLG:IDD_GAMESELECT (English (U.S.))]
 Type=1
@@ -37,3 +39,27 @@ Command5=IDC_SKIP
 Command6=IDC_SOUND
 CommandCount=6
 
+
+[DLG:IDD_GAMESELECT]
+Type=1
+Class=?
+ControlCount=7
+Control1=IDC_LISTAVAILABLE,listbox,1352728833
+Control2=IDC_STATIC,static,1342177806
+Control3=IDC_GAMEDESC,static,1342308352
+Control4=IDC_PLAY,button,1342242816
+Control5=IDC_FILEPATH,static,1342308352
+Control6=IDC_SCAN,button,1342242816
+Control7=IDC_EXIT,button,1342242816
+
+[MNU:IDM_MENU]
+Type=1
+Class=?
+Command1=IDC_LOADSAVE
+Command2=IDC_OPTIONS
+Command3=IDC_EXIT
+Command4=IDC_LANDSCAPE
+Command5=IDC_SKIP
+Command6=IDC_SOUND
+CommandCount=6
+
diff --git a/wince/pocketpc.cpp b/wince/pocketpc.cpp
index edc174498f..1ce292bacb 100644
--- a/wince/pocketpc.cpp
+++ b/wince/pocketpc.cpp
@@ -23,7 +23,7 @@
 #include "scumm.h"
 #include "screen.h"
 #include "gui.h"
-#include "mididrv.h"
+#include "sound/mididrv.h"
 #include "gameDetector.h"
 #include "simon/simon.h"
 #include "gapi_keys.h"