Compile with new config-file support - not used yet, this will be fixed tomorrow

svn-id: r4152

2 files changed, 385 insertions, 114 deletions

diff --git a/wince/PocketSCUMM.vcp b/wince/PocketSCUMM.vcp
index 486924c8f9..ddf1de04eb 100644
--- a/wince/PocketSCUMM.vcp
+++ b/wince/PocketSCUMM.vcp
@@ -255,7 +255,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "." /I "missing" /I ".." /I "../sound" /I "gapi/inc" /I "SDLAudio/include" /I "mad/include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /FR /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "." /I "missing" /I ".." /I "../sound" /I "gapi/inc" /I "SDLAudio/include" /I "mad/include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "COMPRESSED_SOUND_FILE" /FR /YX /Oxs /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -264,7 +264,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib aygshell.lib SDLAudio.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"SDLAudio/lib/ARM" /libpath:"mad/lib/ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib SDLAudio.lib mad.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"SDLAudio/lib/ARM" /libpath:"mad/lib/ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
@@ -288,7 +288,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "missing" /I ".." /I "gapi/inc" /D "DEBUG" /D "ARM" /D "_ARM_" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "missing" /I ".." /I "../sound" /I "gapi/inc" /I "SDLAudio/include" /I "mad/include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "WIN32" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "COMPRESSED_SOUND_FILE" /FR /YX /M$(CECrtMTDebug) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -297,7 +297,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib SDLAudio.lib mad.lib  /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"SDLAudio/lib/ARM" /libpath:"mad/lib/ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -457,17 +457,21 @@ NODEP_CPP_FMOPL=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
 DEP_CPP_FMOPL=\
+	"..\scummsys.h"\
 	"..\sound\fmopl.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_FMOPL=\
+	"..\scummsys.h"\
 	"..\sound\fmopl.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -583,11 +587,14 @@ NODEP_CPP_IMUSE=\
 DEP_CPP_IMUSE=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
+	"..\morphos\morphos.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
 	"..\sound\fmopl.h"\
+	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
@@ -602,16 +609,21 @@ DEP_CPP_IMUSE=\
 DEP_CPP_IMUSE=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
+	"..\morphos\morphos.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
 	"..\sound\fmopl.h"\
+	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -781,6 +793,7 @@ NODEP_CPP_MIDID=\
 DEP_CPP_MIDID=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -790,19 +803,16 @@ DEP_CPP_MIDID=\
 	"..\stdafx.h"\
 	"..\system.h"\
 	".\mad\include\mad.h"\
-	".\missing\sys\time.h"\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_MIDID=\
-	"..\sound\QuickTimeMusic.h"\
-	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDID=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -811,11 +821,9 @@ DEP_CPP_MIDID=\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
-	".\missing\sys\time.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_MIDID=\
-	"..\sound\QuickTimeMusic.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -966,6 +974,7 @@ DEP_CPP_MIXER=\
 DEP_CPP_MIXER=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -983,6 +992,7 @@ DEP_CPP_MIXER=\
 DEP_CPP_MIXER=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -990,7 +1000,9 @@ DEP_CPP_MIXER=\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1153,6 +1165,7 @@ NODEP_CPP_RESOU=\
 DEP_CPP_RESOU=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -1170,16 +1183,17 @@ DEP_CPP_RESOU=\
 DEP_CPP_RESOU=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_RESOU=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1344,6 +1358,7 @@ NODEP_CPP_RESOUR=\
 DEP_CPP_RESOUR=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -1361,16 +1376,17 @@ DEP_CPP_RESOUR=\
 DEP_CPP_RESOUR=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_RESOUR=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1519,13 +1535,13 @@ DEP_CPP_MIDI_=\
 DEP_CPP_MIDI_=\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_MIDI_=\
-	"..\simon\mididrv.h"\
-	"..\simon\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1641,12 +1657,12 @@ DEP_CPP_SIMON=\
 DEP_CPP_SIMON=\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SIMON=\
-	"..\simon\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1760,12 +1776,12 @@ DEP_CPP_SIMONS=\
 DEP_CPP_SIMONS=\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SIMONS=\
-	"..\simon\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1861,6 +1877,7 @@ DEP_CPP_2XSAI=\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -1967,6 +1984,7 @@ NODEP_CPP_ACTOR=\
 DEP_CPP_ACTOR=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -1984,16 +2002,17 @@ DEP_CPP_ACTOR=\
 DEP_CPP_ACTOR=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_ACTOR=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2114,6 +2133,7 @@ NODEP_CPP_AKOS_=\
 DEP_CPP_AKOS_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -2131,16 +2151,17 @@ DEP_CPP_AKOS_=\
 DEP_CPP_AKOS_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_AKOS_=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2261,6 +2282,7 @@ NODEP_CPP_BOXES=\
 DEP_CPP_BOXES=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -2278,16 +2300,17 @@ DEP_CPP_BOXES=\
 DEP_CPP_BOXES=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_BOXES=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2325,6 +2348,179 @@ NODEP_CPP_BOXES=\
 # End Source File
 # Begin Source File
 
+SOURCE="..\config-file.cpp"
+
+!IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
+
+DEP_CPP_CONFI=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
+	"..\stdafx.h"\
+	"..\system.h"\
+	".\missing\unistd.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\costume.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
@@ -2408,6 +2604,7 @@ NODEP_CPP_COSTU=\
 DEP_CPP_COSTU=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -2425,16 +2622,17 @@ DEP_CPP_COSTU=\
 DEP_CPP_COSTU=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_COSTU=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2595,6 +2793,7 @@ NODEP_CPP_GAMED=\
 DEP_CPP_GAMED=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
@@ -2615,19 +2814,20 @@ DEP_CPP_GAMED=\
 DEP_CPP_GAMED=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_GAMED=\
-	"..\imuse.h"\
-	"..\mididrv.h"\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2756,6 +2956,7 @@ NODEP_CPP_GFX_C=\
 DEP_CPP_GFX_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
 	"..\scumm.h"\
@@ -2774,17 +2975,18 @@ DEP_CPP_GFX_C=\
 DEP_CPP_GFX_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_GFX_C=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -2915,6 +3117,7 @@ NODEP_CPP_GUI_C=\
 DEP_CPP_GUI_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
@@ -2937,6 +3140,7 @@ DEP_CPP_GUI_C=\
 DEP_CPP_GUI_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
@@ -2944,14 +3148,14 @@ DEP_CPP_GUI_C=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_GUI_C=\
-	"..\imuse.h"\
-	"..\mididrv.h"\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3104,6 +3308,7 @@ NODEP_CPP_INIT_=\
 DEP_CPP_INIT_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3121,16 +3326,17 @@ DEP_CPP_INIT_=\
 DEP_CPP_INIT_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_INIT_=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3259,6 +3465,7 @@ NODEP_CPP_INSAN=\
 DEP_CPP_INSAN=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3276,16 +3483,17 @@ DEP_CPP_INSAN=\
 DEP_CPP_INSAN=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_INSAN=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3407,6 +3615,7 @@ NODEP_CPP_OBJEC=\
 DEP_CPP_OBJEC=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3424,16 +3633,17 @@ DEP_CPP_OBJEC=\
 DEP_CPP_OBJEC=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_OBJEC=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3554,6 +3764,7 @@ NODEP_CPP_RESOURC=\
 DEP_CPP_RESOURC=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3571,16 +3782,17 @@ DEP_CPP_RESOURC=\
 DEP_CPP_RESOURC=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_RESOURC=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3704,6 +3916,7 @@ NODEP_CPP_SAVEL=\
 DEP_CPP_SAVEL=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3723,18 +3936,19 @@ DEP_CPP_SAVEL=\
 DEP_CPP_SAVEL=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SAVEL=\
-	"..\imuse.h"\
-	"..\mididrv.h"\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -3855,6 +4069,7 @@ NODEP_CPP_SCRIP=\
 DEP_CPP_SCRIP=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -3872,16 +4087,17 @@ DEP_CPP_SCRIP=\
 DEP_CPP_SCRIP=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SCRIP=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4002,6 +4218,7 @@ NODEP_CPP_SCRIPT=\
 DEP_CPP_SCRIPT=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -4019,16 +4236,17 @@ DEP_CPP_SCRIPT=\
 DEP_CPP_SCRIPT=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SCRIPT=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4150,10 +4368,13 @@ NODEP_CPP_SCRIPT_=\
 DEP_CPP_SCRIPT_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4167,16 +4388,19 @@ DEP_CPP_SCRIPT_=\
 DEP_CPP_SCRIPT_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SCRIPT_=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4305,6 +4529,7 @@ NODEP_CPP_SCUMM=\
 DEP_CPP_SCUMM=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
@@ -4326,20 +4551,21 @@ DEP_CPP_SCUMM=\
 DEP_CPP_SCUMM=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SCUMM=\
-	"..\imuse.h"\
-	"..\mididrv.h"\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4469,6 +4695,7 @@ NODEP_CPP_SOUND=\
 DEP_CPP_SOUND=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -4488,18 +4715,19 @@ DEP_CPP_SOUND=\
 DEP_CPP_SOUND=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SOUND=\
-	"..\imuse.h"\
-	"..\mididrv.h"\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4720,6 +4948,7 @@ NODEP_CPP_STRIN=\
 DEP_CPP_STRIN=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -4737,16 +4966,17 @@ DEP_CPP_STRIN=\
 DEP_CPP_STRIN=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_STRIN=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -4867,6 +5097,7 @@ NODEP_CPP_SYS_C=\
 DEP_CPP_SYS_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -4884,16 +5115,17 @@ DEP_CPP_SYS_C=\
 DEP_CPP_SYS_C=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_SYS_C=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -5018,6 +5250,7 @@ NODEP_CPP_VARS_=\
 DEP_CPP_VARS_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -5035,16 +5268,17 @@ DEP_CPP_VARS_=\
 DEP_CPP_VARS_=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_VARS_=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -5166,6 +5400,7 @@ NODEP_CPP_VERBS=\
 DEP_CPP_VERBS=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -5183,16 +5418,17 @@ DEP_CPP_VERBS=\
 DEP_CPP_VERBS=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
-	
-NODEP_CPP_VERBS=\
-	"..\mixer.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -5234,6 +5470,10 @@ NODEP_CPP_VERBS=\
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE="..\config-file.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\sound\fmopl.h
 # End Source File
 # Begin Source File
@@ -5254,10 +5494,6 @@ SOURCE=..\scummsys.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\sound.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\stdafx.h
 # End Source File
 # End Group
@@ -5834,6 +6070,7 @@ NODEP_CPP_POCKE=\
 DEP_CPP_POCKE=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -5882,6 +6119,7 @@ DEP_CPP_POCKE=\
 DEP_CPP_POCKE=\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -5890,22 +6128,40 @@ DEP_CPP_POCKE=\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
 	"..\smush.h"\
+	"..\sound\mididrv.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
 	".\gapi\inc\gx.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
 	".\screen.h"\
+	".\SDLAudio\include\begin_code.h"\
+	".\SDLAudio\include\close_code.h"\
+	".\SDLAudio\include\SDL.h"\
+	".\SDLAudio\include\SDL_active.h"\
+	".\SDLAudio\include\SDL_audio.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	".\SDLAudio\include\SDL_cdrom.h"\
+	".\SDLAudio\include\SDL_error.h"\
+	".\SDLAudio\include\SDL_events.h"\
+	".\SDLAudio\include\SDL_getenv.h"\
+	".\SDLAudio\include\SDL_joystick.h"\
+	".\SDLAudio\include\SDL_keyboard.h"\
+	".\SDLAudio\include\SDL_keysym.h"\
+	".\SDLAudio\include\SDL_main.h"\
+	".\SDLAudio\include\SDL_mouse.h"\
+	".\SDLAudio\include\SDL_mutex.h"\
+	".\SDLAudio\include\SDL_quit.h"\
+	".\SDLAudio\include\SDL_rwops.h"\
+	".\SDLAudio\include\SDL_thread.h"\
+	".\SDLAudio\include\SDL_timer.h"\
+	".\SDLAudio\include\SDL_types.h"\
+	".\SDLAudio\include\SDL_version.h"\
+	".\SDLAudio\include\SDL_video.h"\
 	{$(INCLUDE)}"Aygshell.h"\
 	{$(INCLUDE)}"sipapi.h"\
 	
-NODEP_CPP_POCKE=\
-	"..\mixer.h"\
-	".\mididrv.h"\
-	".\SDL.h"\
-	".\SDL_audio.h"\
-	".\SDL_thread.h"\
-	".\SDL_timer.h"\
-	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
diff --git a/wince/pocketpc.cpp b/wince/pocketpc.cpp
index 3598691434..6ba4f0c0ef 100644
--- a/wince/pocketpc.cpp
+++ b/wince/pocketpc.cpp
@@ -34,6 +34,18 @@
 GameDetector detector;
 Gui gui;
 Scumm *g_scumm;
+Config *scummcfg;
+
+extern void Cls();
+
+extern BOOL isPrescanning();
+extern void changeScanPath();
+extern void startScan();
+extern void endScanPath();
+extern void abortScanPath();
+
+void registry_init();
+void keypad_init();
 
 extern void Cls();
 
@@ -340,6 +352,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
 	int argc = 3;
 	char* argv[3];
 	char argdir[MAX_PATH];
+
 	sound_activated = true;
 	hide_toolbar = false;
 
@@ -351,6 +364,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
 	if (!argv[1])
 		return 0;
 
+	scummcfg = new Config("scummvm.ini", "scummvm");
+
 	if (detector.detectMain(argc, argv))
 		return (-1);
 
@@ -932,7 +947,7 @@ void OSystem_WINCE3::load_gfx_mode() {
 	force_full = true;
 
 	_gfx_buf = (byte*)malloc((320 * 240) * sizeof(byte));	
-	_ms_backup = (byte*)malloc((40 * 40) * sizeof(byte));
+	_ms_backup = (byte*)malloc((40 * 40 * 3) * sizeof(byte));
 }
 
 void OSystem_WINCE3::unload_gfx_mode() {