svn-id: r27027

4 files changed, 77 insertions, 85 deletions

diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index bd2a3cf0dc..30d5bd25d8 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -12,6 +12,7 @@
 		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
 		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
 		MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib		
+		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
 	";
 
 	##
@@ -141,8 +142,8 @@ if (1) # all regular combo's
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'agos'} = "$DefaultTopMacros
@@ -150,41 +151,41 @@ if (1) # all regular combo's
 		//MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY		// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'sky'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
-		//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+		//MACRO			DISABLE_SKY		// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'queen'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
-		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+		MACRO			DISABLE_SKY		// LIB:scummvm_sky.lib
 		//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'gob'} = "$DefaultTopMacros
@@ -196,9 +197,9 @@ if (1) # all regular combo's
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'saga'} = "$DefaultTopMacros
@@ -212,7 +213,7 @@ if (1) # all regular combo's
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'kyra'} = "$DefaultTopMacros
@@ -223,10 +224,10 @@ if (1) # all regular combo's
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		//MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
+		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib	
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
 	# below here you could specify weird & experimental combinations, non-ready engines
@@ -234,8 +235,7 @@ if (1) # all regular combo's
 	$SDK_Variations{'ALL'}{'saga_mini'} = "
 		//MACRO			USE_ZLIB			// LIB:zlib.lib
 		//MACRO			USE_MAD				// LIB:libmad.lib
-		//MACRO			USE_TREMOR			// LIB:libtremor.lib
-		
+		//MACRO			USE_TREMOR			// LIB:libtremor.lib		
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
 		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
@@ -243,31 +243,30 @@ if (1) # all regular combo's
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		//MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
+		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib		
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 	$DefaultBottomMacros";
 
-	$SDK_Variations{'ALL'}{'scumm_no78he'} = "
-		MACRO			USE_ZLIB			// LIB:zlib.lib
-		MACRO			USE_MAD				// LIB:libmad.lib
-		//MACRO			USE_TREMOR			// LIB:libtremor.lib
-		MACRO			DISABLE_SCUMM_7_8
-		MACRO			DISABLE_SCUMM_HE
-		
-		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
-		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
-		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
-		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
-		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-	$DefaultBottomMacros";
+#	$SDK_Variations{'ALL'}{'scumm_no78he'} = "
+#		MACRO			USE_ZLIB			// LIB:zlib.lib
+#		MACRO			USE_MAD				// LIB:libmad.lib
+#		//MACRO			USE_TREMOR			// LIB:libtremor.lib
+#		MACRO			DISABLE_SCUMM_7_8
+#		MACRO			DISABLE_SCUMM_HE		
+#		//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
+#		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
+#		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+#		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
+#		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+#		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
+#		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+#		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+#		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
+#		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib		
+#		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
+#	$DefaultBottomMacros";
 	
 #	$SDK_Variations{'ALL'}{'all_vorbis'} = "
 #		MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -290,15 +289,12 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		
-		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
-		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
 		//MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_agi.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
-	";
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib			
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
+	$DefaultBottomMacros";
 
 	# empty $SDK_Variations{''} string instead of 'ALL' = package disabled
 	$SDK_Variations{'ALL'}{'test_cine'} = "$DefaultTopMacros
@@ -308,52 +304,44 @@ if (1) # all regular combo's
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
 		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		
-		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
-		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		//MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
-
-	";
+		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib		
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
+	$DefaultBottomMacros";
 
 	$SDK_Variations{'ALL'}{'test_agi'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
-		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+		MACRO			DISABLE_SKY		// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		
-		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
-		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib				
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
 		//MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
-		MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
-
-	";
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
+	$DefaultBottomMacros";
 
 
 	$SDK_Variations{'ALL'}{'test_touche'} = "$DefaultTopMacros
 		MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
 		MACRO			DISABLE_AGOS		// LIB:scummvm_agos.lib
-		MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+		MACRO			DISABLE_SKY		// LIB:scummvm_sky.lib
 		MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+		MACRO			DISABLE_GOB		// LIB:scummvm_gob.lib
 		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-		
-		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
-		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
+		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib		
 		MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-		MACRO			DISABLE_AGI			// LIB:scummvm_agi.lib
+		MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib	
+		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 		//MACRO			DISABLE_TOUCHE		// LIB:scummvm_touche.lib
-
+		MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
+		MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
+		MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib			
 	";
 }
 
@@ -368,6 +356,9 @@ if (1) # all regular combo's
 #		MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
 #		MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
 #		MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+#		MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib
+#		MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
+#		MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
 #		//MACRO			DISABLE_SWORD1		// LIB:scummvm_sword1.lib
 #		//MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
 #	";
diff --git a/backends/platform/symbian/S60v3/BLD.INF.in b/backends/platform/symbian/S60v3/BLD.INF.in
index f7b7090adf..d499fccc39 100644
--- a/backends/platform/symbian/S60v3/BLD.INF.in
+++ b/backends/platform/symbian/S60v3/BLD.INF.in
@@ -7,5 +7,5 @@ PRJ_MMPFILES
 	// empty base file, will be updated by Perl build scripts
 	
 //STOP_AUTO_PROJECTS//
-
+gnumakefile icons.mk
 .\ScummVM_S60v3.mmp
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index ec57e4346f..73cbad17cd 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -41,11 +41,12 @@
 
 *"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
 ; Launcher, Application, AIF & Resource file
-"\s60v3\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
-"\s60v3\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
-"\s60v3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-	"!:\resource\apps\scummvm_loc.rsc"
-"\s60v3\epoc32\data\Z\resource\APPS\scummvm.MBM"-	"!:\resource\apps\scummvm.MBM"
-"\s60v3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
+"\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
+"\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
+"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-	"!:\resource\apps\scummvm_loc.rsc"
+"\epoc32\data\Z\resource\APPS\scummvm.MBM"-	"!:\resource\apps\scummvm.MBM"
+"\epoc32\data\Z\resource\APPS\scummvm.MIF"-	"!:\resource\apps\scummvm.MIF"
+"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\data\scummvm\scummvm.ini",FILENULL
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 7ee2c57844..1e529127f9 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -41,11 +41,11 @@
 
 *"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
 ; Application, AIF & Resource file
-"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
-"\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
-"\uiq3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-	"!:\resource\apps\scummvm_loc.rsc"
-"\uiq3\epoc32\data\Z\resource\APPS\scummvm.MBM"-	"!:\resource\apps\scummvm.MBM"
-"\uiq3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
+"\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
+"\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
+"\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-	"!:\resource\apps\scummvm_loc.rsc"
+"\epoc32\data\Z\resource\APPS\scummvm.MBM"-	"!:\resource\apps\scummvm.MBM"
+"\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\shared\scummvm\scummvm.ini",FILENULL