Project update

svn-id: r4710

1 files changed, 692 insertions, 375 deletions

diff --git a/wince/PocketSCUMM.vcp b/wince/PocketSCUMM.vcp
index f4c25701e0..5b9a2773d3 100644
--- a/wince/PocketSCUMM.vcp
+++ b/wince/PocketSCUMM.vcp
@@ -477,10 +477,10 @@ NODEP_CPP_FMOPL=\
 
 DEP_CPP_FMOPL=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\fmopl.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
@@ -496,12 +496,22 @@ NODEP_CPP_FMOPL=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_FMOPL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\sound\fmopl.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_FMOPL=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -632,12 +642,12 @@ NODEP_CPP_IMUSE=\
 
 DEP_CPP_IMUSE=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\morphos\morphos.h"\
 	"..\saveload.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\fmopl.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
@@ -655,14 +665,13 @@ NODEP_CPP_IMUSE=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_IMUSE=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\morphos\morphos.h"\
+	"..\saveload.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\fmopl.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
@@ -673,6 +682,9 @@ DEP_CPP_IMUSE=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_IMUSE=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -841,10 +853,10 @@ NODEP_CPP_MIDID=\
 
 DEP_CPP_MIDID=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\fmopl.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -861,13 +873,12 @@ NODEP_CPP_MIDID=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDID=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
+	"..\sound\fmopl.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
@@ -876,6 +887,9 @@ DEP_CPP_MIDID=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_MIDID=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -1031,10 +1045,10 @@ DEP_CPP_MIXER=\
 
 DEP_CPP_MIXER=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1049,13 +1063,11 @@ NODEP_CPP_MIXER=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIXER=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1063,6 +1075,9 @@ DEP_CPP_MIXER=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_MIXER=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -1224,10 +1239,11 @@ NODEP_CPP_RESOU=\
 
 DEP_CPP_RESOU=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\myresource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1242,13 +1258,12 @@ NODEP_CPP_RESOU=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RESOU=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\myresource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1256,6 +1271,9 @@ DEP_CPP_RESOU=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_RESOU=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -1419,10 +1437,10 @@ NODEP_CPP_RESOUR=\
 
 DEP_CPP_RESOUR=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1437,13 +1455,11 @@ NODEP_CPP_RESOUR=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RESOUR=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -1451,6 +1467,9 @@ DEP_CPP_RESOUR=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_RESOUR=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -1614,6 +1633,9 @@ DEP_CPP_MIDI_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_MIDI_=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -1747,6 +1769,9 @@ DEP_CPP_SIMON=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SIMON=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -2343,6 +2368,9 @@ DEP_CPP_SIMONS=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SIMONS=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -2692,7 +2720,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2706,6 +2733,7 @@ DEP_CPP_DIALO=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2716,7 +2744,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2728,6 +2755,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2738,7 +2766,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2750,6 +2777,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2760,7 +2788,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2772,6 +2799,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2782,7 +2810,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2796,6 +2823,7 @@ DEP_CPP_DIALO=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2806,7 +2834,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2818,6 +2845,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2825,15 +2853,17 @@ NODEP_CPP_DIALO=\
 
 DEP_CPP_DIALO=\
 	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -2849,15 +2879,17 @@ NODEP_CPP_DIALO=\
 
 DEP_CPP_DIALO=\
 	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
+	"..\sound\imuse.h"\
+	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -2876,7 +2908,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2888,6 +2919,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2898,7 +2930,6 @@ DEP_CPP_DIALO=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2910,6 +2941,7 @@ DEP_CPP_DIALO=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_DIALO=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2932,7 +2964,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2946,6 +2977,7 @@ DEP_CPP_LISTW=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2957,7 +2989,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2969,6 +3000,7 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -2980,7 +3012,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -2992,6 +3023,7 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3003,7 +3035,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3015,6 +3046,7 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3026,7 +3058,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3040,6 +3071,7 @@ DEP_CPP_LISTW=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3051,7 +3083,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3063,27 +3094,21 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
 DEP_CPP_LISTW=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3094,21 +3119,14 @@ NODEP_CPP_LISTW=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_LISTW=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3124,7 +3142,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3136,6 +3153,7 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3147,7 +3165,6 @@ DEP_CPP_LISTW=\
 	"..\gui\dialog.h"\
 	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3159,6 +3176,7 @@ DEP_CPP_LISTW=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_LISTW=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3180,7 +3198,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3194,6 +3211,7 @@ DEP_CPP_SCROL=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3204,7 +3222,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3216,6 +3233,7 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3226,7 +3244,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3238,6 +3255,7 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3248,7 +3266,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3260,6 +3277,7 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3270,7 +3288,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3284,6 +3301,7 @@ DEP_CPP_SCROL=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3294,7 +3312,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3306,26 +3323,21 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
 DEP_CPP_SCROL=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3336,20 +3348,14 @@ NODEP_CPP_SCROL=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCROL=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3364,7 +3370,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3376,6 +3381,7 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3386,7 +3392,6 @@ DEP_CPP_SCROL=\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
 	"..\gui\ScrollBarWidget.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3398,6 +3403,7 @@ DEP_CPP_SCROL=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_SCROL=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3410,87 +3416,6 @@ SOURCE=..\gui\ScrollBarWidget.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\gui\util.cpp
-
-!IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
-
-DEP_CPP_UTIL_=\
-	"..\stdafx.h"\
-	".\missing\unistd.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\gui\util.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\gui\widget.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
@@ -3499,7 +3424,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3513,6 +3437,7 @@ DEP_CPP_WIDGE=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3522,7 +3447,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3534,6 +3458,7 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3543,7 +3468,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3555,6 +3479,7 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3564,7 +3489,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3576,6 +3500,7 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3585,7 +3510,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3599,6 +3523,7 @@ DEP_CPP_WIDGE=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3608,7 +3533,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3620,25 +3544,20 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
 DEP_CPP_WIDGE=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3649,19 +3568,13 @@ NODEP_CPP_WIDGE=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_WIDGE=\
-	"..\boxes.h"\
-	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\widget.h"\
 	"..\newgui.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"\
 	
@@ -3675,7 +3588,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3687,6 +3599,7 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3696,7 +3609,6 @@ DEP_CPP_WIDGE=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
@@ -3708,6 +3620,7 @@ DEP_CPP_WIDGE=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_WIDGE=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -3721,111 +3634,183 @@ SOURCE=..\gui\widget.h
 # End Group
 # Begin Source File
 
-SOURCE=..\2xsai.cpp
+SOURCE=..\actor.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\actor.h"\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_2XSAI=\
+NODEP_CPP_ACTOR=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	".\SDL.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	".\SDL.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	".\SDL.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\actor.h"\
+	"..\akos.h"\
+	"..\boxes.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"\
 	
-NODEP_CPP_2XSAI=\
+NODEP_CPP_ACTOR=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	".\SDL.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\actor.h"\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\costume.h"\
+	"..\gfx.h"\
+	"..\resource.h"\
+	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_2XSAI=\
+NODEP_CPP_ACTOR=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\actor.h"\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\costume.h"\
+	"..\gfx.h"\
+	"..\resource.h"\
+	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_ACTOR=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	".\SDL.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
 
-DEP_CPP_2XSAI=\
+DEP_CPP_ACTOR=\
+	"..\akos.h"\
+	"..\boxes.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\smush.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
+NODEP_CPP_ACTOR=\
+	"..\gmidi.h"\
+	"..\sound.h"\
+	
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\actor.cpp
+SOURCE=..\akos.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
@@ -3839,49 +3824,49 @@ DEP_CPP_ACTOR=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
@@ -3896,32 +3881,32 @@ DEP_CPP_ACTOR=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -3929,20 +3914,20 @@ DEP_CPP_ACTOR=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
+	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -3950,22 +3935,25 @@ DEP_CPP_ACTOR=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_AKOS_=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
 
-DEP_CPP_ACTOR=\
+DEP_CPP_AKOS_=\
 	"..\akos.h"\
 	"..\boxes.h"\
 	"..\gfx.h"\
@@ -3976,7 +3964,7 @@ DEP_CPP_ACTOR=\
 	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_ACTOR=\
+NODEP_CPP_AKOS_=\
 	"..\gmidi.h"\
 	"..\sound.h"\
 	
@@ -3986,11 +3974,11 @@ NODEP_CPP_ACTOR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\akos.cpp
+SOURCE=..\boxes.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
@@ -4004,49 +3992,49 @@ DEP_CPP_AKOS_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\actor.h"\
 	"..\akos.h"\
 	"..\boxes.h"\
@@ -4061,32 +4049,31 @@ DEP_CPP_AKOS_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\actor.h"\
-	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4094,20 +4081,19 @@ DEP_CPP_AKOS_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
-DEP_CPP_AKOS_=\
-	"..\akos.h"\
+DEP_CPP_BOXES=\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4115,22 +4101,25 @@ DEP_CPP_AKOS_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_BOXES=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\stdafx.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	".\SDL.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
 
-DEP_CPP_AKOS_=\
+DEP_CPP_BOXES=\
 	"..\akos.h"\
 	"..\boxes.h"\
 	"..\gfx.h"\
@@ -4141,7 +4130,7 @@ DEP_CPP_AKOS_=\
 	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_AKOS_=\
+NODEP_CPP_BOXES=\
 	"..\gmidi.h"\
 	"..\sound.h"\
 	
@@ -4151,74 +4140,86 @@ NODEP_CPP_AKOS_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\boxes.cpp
+SOURCE=..\bundle.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
 
-DEP_CPP_BOXES=\
-	"..\actor.h"\
-	"..\akos.h"\
+DEP_CPP_BUNDL=\
 	"..\boxes.h"\
+	"..\bundle.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"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_BUNDL=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_BOXES=\
+DEP_CPP_BUNDL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	".\SDL.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
 
-DEP_CPP_BOXES=\
+DEP_CPP_BUNDL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	".\SDL.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
 
-DEP_CPP_BOXES=\
+DEP_CPP_BUNDL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	".\SDL.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
 
-DEP_CPP_BOXES=\
-	"..\actor.h"\
-	"..\akos.h"\
+DEP_CPP_BUNDL=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4226,31 +4227,35 @@ DEP_CPP_BOXES=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_BUNDL=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BOXES=\
+DEP_CPP_BUNDL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	".\SDL.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
 
-DEP_CPP_BOXES=\
-	"..\actor.h"\
+DEP_CPP_BUNDL=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4258,20 +4263,18 @@ DEP_CPP_BOXES=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
-NODEP_CPP_BOXES=\
+NODEP_CPP_BUNDL=\
 	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
-DEP_CPP_BOXES=\
-	"..\akos.h"\
+DEP_CPP_BUNDL=\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4279,35 +4282,42 @@ DEP_CPP_BOXES=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
-DEP_CPP_BOXES=\
+DEP_CPP_BUNDL=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	".\SDL.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
 
-DEP_CPP_BOXES=\
-	"..\akos.h"\
+DEP_CPP_BUNDL=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
 	".\missing\unistd.h"\
 	
-NODEP_CPP_BOXES=\
-	"..\gmidi.h"\
-	"..\sound.h"\
+NODEP_CPP_BUNDL=\
+	"..\macos.h"\
 	
 
 !ENDIF 
@@ -4426,11 +4436,11 @@ DEP_CPP_CONFI=\
 
 DEP_CPP_CONFI=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4445,13 +4455,12 @@ NODEP_CPP_CONFI=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CONFI=\
-	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4459,6 +4468,9 @@ DEP_CPP_CONFI=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_CONFI=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -4593,10 +4605,11 @@ NODEP_CPP_COSTU=\
 DEP_CPP_COSTU=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\costume.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4611,13 +4624,13 @@ NODEP_CPP_COSTU=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_COSTU=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
+	"..\costume.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4625,6 +4638,9 @@ DEP_CPP_COSTU=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_COSTU=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -4790,12 +4806,12 @@ NODEP_CPP_GAMED=\
 
 DEP_CPP_GAMED=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -4812,14 +4828,13 @@ NODEP_CPP_GAMED=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_GAMED=\
-	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -4829,6 +4844,9 @@ DEP_CPP_GAMED=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_GAMED=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -4971,11 +4989,13 @@ NODEP_CPP_GFX_C=\
 DEP_CPP_GFX_C=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
+	"..\newgui.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -4990,14 +5010,15 @@ NODEP_CPP_GFX_C=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_GFX_C=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
+	"..\newgui.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5005,6 +5026,9 @@ DEP_CPP_GFX_C=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_GFX_C=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -5150,6 +5174,7 @@ NODEP_CPP_GUI_C=\
 
 DEP_CPP_GUI_C=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -5157,7 +5182,6 @@ DEP_CPP_GUI_C=\
 	"..\guimaps.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -5174,8 +5198,8 @@ NODEP_CPP_GUI_C=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_GUI_C=\
-	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -5183,7 +5207,6 @@ DEP_CPP_GUI_C=\
 	"..\guimaps.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -5193,6 +5216,9 @@ DEP_CPP_GUI_C=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_GUI_C=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -5349,12 +5375,11 @@ NODEP_CPP_INIT_=\
 DEP_CPP_INIT_=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
-	"..\gui\util.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5369,13 +5394,13 @@ NODEP_CPP_INIT_=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INIT_=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5383,6 +5408,9 @@ DEP_CPP_INIT_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_INIT_=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -5520,6 +5548,7 @@ NODEP_CPP_INSAN=\
 
 DEP_CPP_INSAN=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -5538,9 +5567,8 @@ NODEP_CPP_INSAN=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INSAN=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -5552,6 +5580,9 @@ DEP_CPP_INSAN=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_INSAN=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -5597,7 +5628,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5612,6 +5642,7 @@ DEP_CPP_NEWGU=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5621,7 +5652,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5634,6 +5664,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5643,7 +5674,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5656,6 +5686,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5665,7 +5696,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5678,6 +5708,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5687,7 +5718,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5702,6 +5732,7 @@ DEP_CPP_NEWGU=\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5711,7 +5742,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5724,6 +5754,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5731,15 +5762,15 @@ NODEP_CPP_NEWGU=\
 
 DEP_CPP_NEWGU=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5755,15 +5786,15 @@ NODEP_CPP_NEWGU=\
 
 DEP_CPP_NEWGU=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
+	"..\gui\ListWidget.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5781,7 +5812,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5794,6 +5824,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5803,7 +5834,6 @@ DEP_CPP_NEWGU=\
 	"..\boxes.h"\
 	"..\gfx.h"\
 	"..\gui\dialog.h"\
-	"..\gui\util.h"\
 	"..\gui\widget.h"\
 	"..\guimaps.h"\
 	"..\newgui.h"\
@@ -5816,6 +5846,7 @@ DEP_CPP_NEWGU=\
 	".\missing\unistd.h"\
 	
 NODEP_CPP_NEWGU=\
+	"..\gui\util.h"\
 	"..\macos.h"\
 	
 
@@ -5920,10 +5951,12 @@ NODEP_CPP_OBJEC=\
 DEP_CPP_OBJEC=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5938,13 +5971,14 @@ NODEP_CPP_OBJEC=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_OBJEC=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -5952,6 +5986,9 @@ DEP_CPP_OBJEC=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_OBJEC=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6081,10 +6118,11 @@ NODEP_CPP_RESOURC=\
 
 DEP_CPP_RESOURC=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6099,13 +6137,12 @@ NODEP_CPP_RESOURC=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RESOURC=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6113,6 +6150,9 @@ DEP_CPP_RESOURC=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_RESOURC=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6250,12 +6290,13 @@ NODEP_CPP_SAVEL=\
 DEP_CPP_SAVEL=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
 	"..\saveload.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -6272,13 +6313,15 @@ NODEP_CPP_SAVEL=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SAVEL=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
+	"..\saveload.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -6288,6 +6331,9 @@ DEP_CPP_SAVEL=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SAVEL=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6324,6 +6370,137 @@ NODEP_CPP_SAVEL=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\scaler.cpp
+
+!IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
+
+DEP_CPP_SCALE=\
+	"..\scaler.h"\
+	"..\scummsys.h"\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+NODEP_CPP_SCALE=\
+	"..\macos.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\script.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
@@ -6420,10 +6597,11 @@ NODEP_CPP_SCRIP=\
 DEP_CPP_SCRIP=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6438,13 +6616,13 @@ NODEP_CPP_SCRIP=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCRIP=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6452,6 +6630,9 @@ DEP_CPP_SCRIP=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SCRIP=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6584,10 +6765,10 @@ NODEP_CPP_SCRIPT=\
 DEP_CPP_SCRIPT=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6602,13 +6783,12 @@ NODEP_CPP_SCRIPT=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCRIPT=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -6616,6 +6796,9 @@ DEP_CPP_SCRIPT=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SCRIPT=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6753,6 +6936,7 @@ NODEP_CPP_SCRIPT_=\
 DEP_CPP_SCRIPT_=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -6773,9 +6957,9 @@ NODEP_CPP_SCRIPT_=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCRIPT_=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
@@ -6789,6 +6973,9 @@ DEP_CPP_SCRIPT_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SCRIPT_=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -6933,11 +7120,14 @@ NODEP_CPP_SCUMM=\
 DEP_CPP_SCUMM=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\debug.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
-	"..\gui\util.h"\
 	"..\newgui.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
@@ -6957,12 +7147,16 @@ NODEP_CPP_SCUMM=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SCUMM=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
+	"..\debug.h"\
 	"..\gameDetector.h"\
 	"..\gfx.h"\
 	"..\gui.h"\
+	"..\newgui.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\smush.h"\
@@ -6975,6 +7169,9 @@ DEP_CPP_SCUMM=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SCUMM=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7120,11 +7317,11 @@ NODEP_CPP_SOUND=\
 DEP_CPP_SOUND=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -7141,13 +7338,13 @@ NODEP_CPP_SOUND=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SOUND=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\imuse.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
@@ -7157,6 +7354,9 @@ DEP_CPP_SOUND=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SOUND=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7383,10 +7583,10 @@ NODEP_CPP_STRIN=\
 DEP_CPP_STRIN=\
 	"..\actor.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7401,13 +7601,12 @@ NODEP_CPP_STRIN=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_STRIN=\
-	"..\akos.h"\
+	"..\actor.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7415,6 +7614,9 @@ DEP_CPP_STRIN=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_STRIN=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7544,10 +7746,10 @@ NODEP_CPP_SYS_C=\
 
 DEP_CPP_SYS_C=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7562,13 +7764,11 @@ NODEP_CPP_SYS_C=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SYS_C=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7576,6 +7776,9 @@ DEP_CPP_SYS_C=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_SYS_C=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7612,6 +7815,83 @@ NODEP_CPP_SYS_C=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\util.cpp
+
+!IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Release"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH4) Debug"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Release"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE SH3) Debug"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Release"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Debug"
+
+DEP_CPP_UTIL_=\
+	"..\stdafx.h"\
+	".\missing\unistd.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\vars.cpp
 
 !IF  "$(CFG)" == "PocketSCUMM - Win32 (WCE MIPS) Release"
@@ -7709,10 +7989,10 @@ NODEP_CPP_VARS_=\
 
 DEP_CPP_VARS_=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7727,13 +8007,11 @@ NODEP_CPP_VARS_=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VARS_=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7741,6 +8019,9 @@ DEP_CPP_VARS_=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_VARS_=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7871,10 +8152,12 @@ NODEP_CPP_VERBS=\
 
 DEP_CPP_VERBS=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7889,13 +8172,13 @@ NODEP_CPP_VERBS=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VERBS=\
-	"..\akos.h"\
 	"..\boxes.h"\
-	"..\config-file.h"\
+	"..\bundle.h"\
 	"..\gfx.h"\
+	"..\object.h"\
+	"..\resource.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -7903,6 +8186,9 @@ DEP_CPP_VERBS=\
 	".\missing\unistd.h"\
 	".\SDLAudio\include\SDL_byteorder.h"\
 	
+NODEP_CPP_VERBS=\
+	"..\macos.h"\
+	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
 
@@ -7943,6 +8229,18 @@ NODEP_CPP_VERBS=\
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=..\akos.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\boxes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\bundle.h
+# End Source File
+# Begin Source File
+
 SOURCE="..\config-file.h"
 # End Source File
 # Begin Source File
@@ -7967,6 +8265,10 @@ SOURCE=..\newgui.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\scaler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\scumm.h
 # End Source File
 # Begin Source File
@@ -7977,6 +8279,10 @@ SOURCE=..\scummsys.h
 
 SOURCE=..\stdafx.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\util.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -8149,11 +8455,11 @@ NODEP_CPP_FINDG=\
 
 DEP_CPP_FINDG=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
 	"..\gfx.h"\
 	"..\scumm.h"\
 	"..\scummsys.h"\
-	"..\smush.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
 	"..\system.h"\
@@ -8168,8 +8474,21 @@ NODEP_CPP_FINDG=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_FINDG=\
+	"..\boxes.h"\
+	"..\bundle.h"\
+	"..\config-file.h"\
+	"..\gfx.h"\
+	"..\scumm.h"\
+	"..\scummsys.h"\
+	"..\sound\mixer.h"\
 	"..\stdafx.h"\
+	"..\system.h"\
+	".\mad\include\mad.h"\
 	".\missing\unistd.h"\
+	".\SDLAudio\include\SDL_byteorder.h"\
+	
+NODEP_CPP_FINDG=\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -8292,10 +8611,8 @@ DEP_CPP_GAPI_=\
 	".\gapi\inc\gx.h"\
 	".\missing\unistd.h"\
 	".\screen.h"\
-	
-NODEP_CPP_GAPI_=\
-	".\ipapi.h"\
-	".\ygshell.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -8577,7 +8894,9 @@ NODEP_CPP_POCKE=\
 
 DEP_CPP_POCKE=\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
+	"..\debug.h"\
 	"..\gameDetector.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -8585,7 +8904,6 @@ DEP_CPP_POCKE=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
-	"..\smush.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
@@ -8627,9 +8945,10 @@ NODEP_CPP_POCKE=\
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE ARM) Debug"
 
 DEP_CPP_POCKE=\
-	"..\akos.h"\
 	"..\boxes.h"\
+	"..\bundle.h"\
 	"..\config-file.h"\
+	"..\debug.h"\
 	"..\gameDetector.h"\
 	"..\gapi_keys.h"\
 	"..\gfx.h"\
@@ -8637,7 +8956,6 @@ DEP_CPP_POCKE=\
 	"..\scumm.h"\
 	"..\scummsys.h"\
 	"..\simon\simon.h"\
-	"..\smush.h"\
 	"..\sound\mididrv.h"\
 	"..\sound\mixer.h"\
 	"..\stdafx.h"\
@@ -8669,10 +8987,11 @@ DEP_CPP_POCKE=\
 	".\SDLAudio\include\SDL_types.h"\
 	".\SDLAudio\include\SDL_version.h"\
 	".\SDLAudio\include\SDL_video.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 NODEP_CPP_POCKE=\
-	".\ipapi.h"\
-	".\ygshell.h"\
+	"..\macos.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"
@@ -8827,10 +9146,8 @@ DEP_CPP_SCREE=\
 DEP_CPP_SCREE=\
 	".\gapi\inc\gx.h"\
 	".\screen.h"\
-	
-NODEP_CPP_SCREE=\
-	".\ipapi.h"\
-	".\ygshell.h"\
+	{$(INCLUDE)}"Aygshell.h"\
+	{$(INCLUDE)}"sipapi.h"\
 	
 
 !ELSEIF  "$(CFG)" == "PocketSCUMM - Win32 (WCE x86em) Release"