diff options
| author | anotherguest | 2014-05-06 09:11:41 +0200 |
|---|---|---|
| committer | anotherguest | 2014-05-06 09:11:41 +0200 |
| commit | 4571f3e3e40ac66070124f3370d50ea1af1da1ce (patch) | |
| tree | 66181b83d0ac937667061fcdb573b795a1789d36 /backends/platform/symbian/mmp/scummvm_base.mmp.in | |
| parent | 7a27be396350309b9a23b587d0a566603370e27a (diff) | |
| download | scummvm-rg350-4571f3e3e40ac66070124f3370d50ea1af1da1ce.tar.gz scummvm-rg350-4571f3e3e40ac66070124f3370d50ea1af1da1ce.tar.bz2 scummvm-rg350-4571f3e3e40ac66070124f3370d50ea1af1da1ce.zip | |
SYMBIAN: Updated Symbian support, help text
Diffstat (limited to 'backends/platform/symbian/mmp/scummvm_base.mmp.in')
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_base.mmp.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in index 358a2ec961..cc65980b71 100644 --- a/backends/platform/symbian/mmp/scummvm_base.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in @@ -2,7 +2,7 @@ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer - * Copyright (C) 2005-2014 The ScummVM Team + * Copyright (C) 2005-2013 The ScummVM project * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT @@ -34,7 +34,9 @@ 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 -Wno-unused -Wno-format -fsigned-char +// using option -Wno-psabi to supress warning "note: the mangling of 'va_list' has changed in GCC 4.4" +// compiler will 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 // Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them! @@ -54,9 +56,12 @@ 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 @@ -115,6 +120,7 @@ SOURCEPATH ..\..\..\..\video //STOP_AUTO_OBJECTS_VIDEO_// // add a few files manually, since they are not parsed from modules.mk files +SOURCE theora_decoder.cpp SOURCE bink_decoder.cpp SOURCE codecs\mpeg.cpp @@ -159,4 +165,5 @@ SOURCE backends\vkeybd\virtual-keyboard.cpp // Downscaler SOURCE graphics\scaler\downscaler.cpp +SOURCE graphics\scaler\downscalerARM.s MACRO SDL_BACKEND |