aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/symbian/mmp/scummvm_base.mmp.in
diff options
context:
space:
mode:
authoranotherguest2014-09-08 10:48:49 +0200
committeranotherguest2014-09-08 10:48:49 +0200
commitca144290a6c2baf7fd7995460136fde6b46bdb42 (patch)
treee386ea7ddb1e8f15bc45ea2aa0f96dd4b5da2a52 /backends/platform/symbian/mmp/scummvm_base.mmp.in
parent4afb40e16f20bad0da4d67222cf8193c51d5ee8f (diff)
downloadscummvm-rg350-ca144290a6c2baf7fd7995460136fde6b46bdb42.tar.gz
scummvm-rg350-ca144290a6c2baf7fd7995460136fde6b46bdb42.tar.bz2
scummvm-rg350-ca144290a6c2baf7fd7995460136fde6b46bdb42.zip
SYMBIAN: Updated settings and moved to config.mmh
Diffstat (limited to 'backends/platform/symbian/mmp/scummvm_base.mmp.in')
-rw-r--r--backends/platform/symbian/mmp/scummvm_base.mmp.in26
1 files changed, 6 insertions, 20 deletions
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index c3f12f6858..88aa689f5b 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -32,12 +32,10 @@
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
-// using option -Wno-psabi to supress warning "note: the mangling of 'va_list' has changed in GCC 4.4"
+#include "config.mmh"
+
// compiler must use png.h from libpng.lib instead ScummVM's
-OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
-ALWAYS_BUILD_AS_ARM
+OPTION GCCE -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
// Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
//START_AUTO_MACROS_MASTER//
@@ -50,21 +48,9 @@ ALWAYS_BUILD_AS_ARM
// *** Include paths
-USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio
-USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
-USERINCLUDE \epoc32\include\mpeg2dec //\epoc32\include\theora
-
-SYSTEMINCLUDE \epoc32\include\freetype
-SYSTEMINCLUDE \epoc32\include\mpeg2dec
-SYSTEMINCLUDE \epoc32\include\jpeg
-SYSTEMINCLUDE \epoc32\include\png
-SYSTEMINCLUDE \epoc32\include\ESDL
-SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include\theora
-SYSTEMINCLUDE \epoc32\include\tremor
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE ..\src // for portdefs.h
+USERINCLUDE ..\..\..\..\backends\fs ..\..\..\..\backends\platform\sdl
+USERINCLUDE \epoc32\include\mpeg2dec
+
// *** SOURCE files