diff options
| author | Eugene Sandulenko | 2015-01-11 21:12:01 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-01-11 21:12:01 +0100 |
| commit | 8e0d7d72554a7f21e3c717871da3895c3d8ec118 (patch) | |
| tree | 5e175caa0c1eedf3d01ad5b676750d47c0215942 /backends/platform | |
| parent | dd7da7c3c352e28792b1feeab725821ebf4fcafc (diff) | |
| parent | dd5f5588d9fb29179dfd0f354728dc6cacf26897 (diff) | |
| download | scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.tar.gz scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.tar.bz2 scummvm-rg350-8e0d7d72554a7f21e3c717871da3895c3d8ec118.zip | |
Merge pull request #559 from fedor4ever/master
VIDEO: Add Theora support to systems which use libtremor
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_voyeur.mmp.in | 22 | ||||
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_zvision.mmp.in | 1 |
2 files changed, 2 insertions, 21 deletions
diff --git a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in index 86dc32b3f8..4221e34195 100644 --- a/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_voyeur.mmp.in @@ -32,10 +32,7 @@ TARGET scummvm_voyeur.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 -ALWAYS_BUILD_AS_ARM +#include "config.mmh" //START_AUTO_MACROS_SLAVE// @@ -52,20 +49,3 @@ SOURCEPATH ..\..\..\..\engines\voyeur // empty base file, will be updated by Perl build scripts //STOP_AUTO_OBJECTS_VOYEUR_// - -// *** Include paths - -USERINCLUDE ..\..\..\..\engines -USERINCLUDE ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src - -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 diff --git a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in index e647275dbc..ea0a7b0102 100644 --- a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in @@ -33,6 +33,7 @@ TARGET scummvm_zvision.lib TARGETTYPE lib +USERINCLUDE ..\..\..\..\engines\zvision\graphics #include "config.mmh" //START_AUTO_MACROS_SLAVE// |