aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
diff options
context:
space:
mode:
authorLars Persson2008-06-26 16:51:02 +0000
committerLars Persson2008-06-26 16:51:02 +0000
commitfafda89d0c53a2ac9b0521c1e4549388f14ccea0 (patch)
treee0a9b109f0b72bc5a7969598e3a0a86d0869d798 /backends/platform/symbian/mmp/scummvm_scumm.mmp.in
parentd7051a8ef7e9569bb0d13ef437c6605ce4dbe1cc (diff)
downloadscummvm-rg350-fafda89d0c53a2ac9b0521c1e4549388f14ccea0.tar.gz
scummvm-rg350-fafda89d0c53a2ac9b0521c1e4549388f14ccea0.tar.bz2
scummvm-rg350-fafda89d0c53a2ac9b0521c1e4549388f14ccea0.zip
Fixed Symbian buildsystem for new defines. Fixed ARM asm syntax for Symbian build.
svn-id: r32803
Diffstat (limited to 'backends/platform/symbian/mmp/scummvm_scumm.mmp.in')
-rw-r--r--backends/platform/symbian/mmp/scummvm_scumm.mmp.in21
1 files changed, 16 insertions, 5 deletions
diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
index 39490cfd29..7eecfd3ff6 100644
--- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
@@ -30,7 +30,7 @@ TARGET scummvm_scumm.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
//START_AUTO_MACROS_SLAVE//
@@ -43,23 +43,34 @@ ALWAYS_BUILD_AS_ARM
SOURCEPATH ..\..\..\..\engines\scumm
+
//START_AUTO_OBJECTS_SCUMM_//
// empty base file, will be updated by Perl build scripts
//STOP_AUTO_OBJECTS_SCUMM_//
+#if !defined (WINS)
+SOURCE gfxARM.s // ARM version: add ASM routines
+SOURCE proc3ARM.s // ARM version: add ASM routines
+#endif
+
-//START_AUTO_OBJECTS_SCUMM_DISABLE_SCUMM_7_8//
+//START_AUTO_OBJECTS_SCUMM_ENABLE_SCUMM_7_8//
// empty base file, will be updated by Perl build scripts
-//STOP_AUTO_OBJECTS_SCUMM_DISABLE_SCUMM_7_8//
+//STOP_AUTO_OBJECTS_SCUMM_ENABLE_SCUMM_7_8//
+#if !defined (WINS)
+SOURCE smush/codec47ARM.s // ARM version: add ASM routines
+#endif
-//START_AUTO_OBJECTS_SCUMM_DISABLE_HE//
+
+//START_AUTO_OBJECTS_SCUMM_ENABLE_HE//
// empty base file, will be updated by Perl build scripts
-//STOP_AUTO_OBJECTS_SCUMM_DISABLE_HE//
+//STOP_AUTO_OBJECTS_SCUMM_ENABLE_HE//
+
// *** Include paths