thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYMBIAN: Additional makefile updates.

Browse source
This commit is contained in:
anotherguest 2014-09-08 14:40:23 +02:00
parent ca144290a6
commit 5f9febee3d
9 changed files with 11 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/symbian/mmp/config.mmh
View file

@ -48,7 +48,7 @@ OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid l
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
// -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4" // -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
OPTION GCCE -pipe -Wno-multichar -Wno-reorder -Wno-unused \ OPTION GCCE -pipe -Wno-multichar -Wno-reorder -Wno-unused \
-Wno-format -fsigned-char -Wno-psabi -Wno-format -fsigned-char-Wno-psabi
ALWAYS_BUILD_AS_ARM ALWAYS_BUILD_AS_ARM
// *** Include paths // *** Include paths

21
backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_tinsel.lib TARGET scummvm_tinsel.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\tinsel
//STOP_AUTO_OBJECTS_TINSEL_// //STOP_AUTO_OBJECTS_TINSEL_//
// *** 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

23
backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_TOLTECS.lib TARGET scummvm_TOLTECS.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -45,7 +42,7 @@ ALWAYS_BUILD_AS_ARM
// *** SOURCE files // *** SOURCE files
SOURCEPATH ..\..\..\..\engines\TOLTECS SOURCEPATH ..\..\..\..\engines\toltecs
//START_AUTO_OBJECTS_TOLTECS_// //START_AUTO_OBJECTS_TOLTECS_//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\TOLTECS
//STOP_AUTO_OBJECTS_TOLTECS_// //STOP_AUTO_OBJECTS_TOLTECS_//
// *** 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

23
backends/platform/symbian/mmp/scummvm_tony.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_TONY.lib TARGET scummvm_TONY.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -45,7 +42,7 @@ ALWAYS_BUILD_AS_ARM
// *** SOURCE files // *** SOURCE files
SOURCEPATH ..\..\..\..\engines\TONY SOURCEPATH ..\..\..\..\engines\tony
//START_AUTO_OBJECTS_TONY_// //START_AUTO_OBJECTS_TONY_//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\TONY
//STOP_AUTO_OBJECTS_TONY_// //STOP_AUTO_OBJECTS_TONY_//
// *** 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

21
backends/platform/symbian/mmp/scummvm_toon.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_toon.lib TARGET scummvm_toon.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\toon
//STOP_AUTO_OBJECTS_TOON_// //STOP_AUTO_OBJECTS_TOON_//
// *** 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

21
backends/platform/symbian/mmp/scummvm_touche.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_touche.lib TARGET scummvm_touche.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\touche
//STOP_AUTO_OBJECTS_TOUCHE_// //STOP_AUTO_OBJECTS_TOUCHE_//
// *** 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

21
backends/platform/symbian/mmp/scummvm_tucker.mmp.in
View file

@ -32,10 +32,7 @@
TARGET scummvm_tucker.lib TARGET scummvm_tucker.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\tucker
//STOP_AUTO_OBJECTS_TUCKER_// //STOP_AUTO_OBJECTS_TUCKER_//
// *** 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

22
backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
View file

@ -32,11 +32,7 @@
TARGET scummvm_wintermute.lib TARGET scummvm_wintermute.lib
TARGETTYPE 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 #include "config.mmh"
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
// -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
OPTION GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -54,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\wintermute
//STOP_AUTO_OBJECTS_WINTERMUTE_// //STOP_AUTO_OBJECTS_WINTERMUTE_//
// *** 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

20
backends/platform/symbian/mmp/scummvm_zvision.mmp.in
View file

@ -33,10 +33,7 @@
TARGET scummvm_zvision.lib TARGET scummvm_zvision.lib
TARGETTYPE 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 #include "config.mmh"
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
//START_AUTO_MACROS_SLAVE// //START_AUTO_MACROS_SLAVE//
@ -54,18 +51,3 @@ SOURCEPATH ..\..\..\..\engines\zvision
//STOP_AUTO_OBJECTS_ZVISION_// //STOP_AUTO_OBJECTS_ZVISION_//
// *** 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