Fixed Symbian buildsystem for new defines. Fixed ARM asm syntax for Symbian build.

svn-id: r32803

1 files changed, 22 insertions, 33 deletions

diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 761d4867e7..d1c8878d4b 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -30,36 +30,15 @@ TARGET          scummvm_base.lib
 TARGETTYPE      lib
 OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
 OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -fsigned-char
+OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
 ALWAYS_BUILD_AS_ARM
 
 // Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
 //START_AUTO_MACROS_MASTER//
 
 	// empty base file, will be updated by Perl build scripts
-
-	// list of possible MACROs: (will be replaced when generating scummvm_base.mmp)
-	//MACRO			USE_ZLIB			// LIB:zlib.lib
-	//MACRO			USE_MAD				// LIB:libmad.lib
-	//MACRO			USE_TREMOR			// LIB:libtremor.lib
-	//MACRO			USE_UIQ_SE_VIBRA	// LIB:vibration.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_SWORD1		// LIB:scummvm_sword1.lib
-	//MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
-	//MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
-	//MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-	//MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
-	//MACRO			DISABLE_PARALLACTION	// LIB:scummvm_parallaction.lib
-	//MACRO			DISABLE_CRUISE		// LIB:scummvm_cruise.lib
-	//MACRO			DISABLE_DRASCULA	// LIB:scummvm_drascula.lib
+	// this file will be modified first, then from here all
+	// MACROs will be replicated to the other MPP files.
 
 //STOP_AUTO_MACROS_MASTER//
 
@@ -77,6 +56,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
+
 SOURCEPATH ..\..\..\..\common
 //START_AUTO_OBJECTS_COMMON_//
 
@@ -84,6 +64,7 @@ SOURCEPATH ..\..\..\..\common
 
 //STOP_AUTO_OBJECTS_COMMON_//
 
+
 SOURCEPATH ..\..\..\..\graphics
 //START_AUTO_OBJECTS_GRAPHICS_//
 
@@ -91,6 +72,7 @@ SOURCEPATH ..\..\..\..\graphics
 
 //STOP_AUTO_OBJECTS_GRAPHICS_//
 
+
 SOURCEPATH ..\..\..\..\gui
 //START_AUTO_OBJECTS_GUI_//
 
@@ -103,6 +85,7 @@ SOURCEPATH ..\..\..\..\gui
 //SOURCE KeysDialog.cpp
 //SOURCE Actions.cpp
 
+
 SOURCEPATH ..\..\..\..\sound
 //START_AUTO_OBJECTS_SOUND_//
 
@@ -110,16 +93,22 @@ SOURCEPATH ..\..\..\..\sound
 
 //STOP_AUTO_OBJECTS_SOUND_//
 #if defined (WINS)
-SOURCE rate.cpp
+SOURCE rate.cpp			// WINS emulator version: add regular .cpp
 #else
-SOURCE rate_arm.cpp
+SOURCE rate_arm.cpp		// ARM version: add ASM .cpp wrapper
+SOURCE rate_arm_asm.s	// ARM version: add ASM routines
 #endif
-sourcepath ..\..\..\..
-source	   backends\events\default\default-events.cpp
-source	   backends\timer\default\default-timer.cpp
-source	   backends\saves\savefile.cpp
-source	   backends\saves\default\default-saves.cpp
-source	   backends\saves\compressed\compressed-saves.cpp
-source	   engines\engine.cpp
+
+
+// add a few files manually, since they are not parsed from modules.mk files
+SOURCEPATH ..\..\..\..
+SOURCE	   backends\events\default\default-events.cpp
+SOURCE	   backends\timer\default\default-timer.cpp
+SOURCE	   backends\saves\savefile.cpp
+SOURCE	   backends\saves\default\default-saves.cpp
+SOURCE	   backends\saves\compressed\compressed-saves.cpp
+SOURCE	   engines\engine.cpp
+
+
 // backend specific includes
 // backend specific includes