SYMBIAN: Move options into config.mmh file and updated other makefiles.

5 files changed, 127 insertions, 61 deletions

diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh
new file mode 100644
index 0000000000..12c1fc2d2d
--- /dev/null
+++ b/backends/platform/symbian/mmp/config.mmh
@@ -0,0 +1,69 @@
+/* ScummVM - Graphic Adventure Engine
+ * 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) 2014 Fedor Strizhniou
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// Common EPOC MMP makefiles option storage for ScummVM
+//
+
+/*
+ * MACRO REMOVE_UNDEFINED used for bypass this bug -
+ * http://sourceforge.net/p/scummvm/bugs/6437/
+ * Requre change in epoc32\include\libc\sys\unistd.h by
+ *
+ *  #ifndef REMOVE_UNDEFINED
+ *  #define remove(x)       unlink(x)
+ *  #define wremove(x)       wunlink(x)
+ *  #endif //REMOVE_UNDEFINED
+ *
+ * Affects Avalanche, CGE2 and Tsage
+ */
+
+// *** Definitions
+
+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
+// -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 \
+ -Wno-format -fsigned-char-Wno-psabi
+ALWAYS_BUILD_AS_ARM
+
+// *** 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_avalanche.mmp.in b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
index 5260edc79d..40047bb6b7 100644
--- a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
@@ -33,10 +33,8 @@
 
 TARGET          scummvm_avalanche.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
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +52,3 @@ SOURCEPATH ..\..\..\..\engines\avalanche
 
 //STOP_AUTO_OBJECTS_AVALANCHE_//
 
-// *** 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_cge2.mmp.in b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
new file mode 100644
index 0000000000..f9c97e1d83
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ * 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-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
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_cge2.lib
+TARGETTYPE      lib
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\cge2
+
+//START_AUTO_OBJECTS_CGE2_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_CGE2_//
+
diff --git a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
index 7612ad2bae..dc5d4da6b7 100644
--- a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_fullpipe.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//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\fullpipe
 
 //STOP_AUTO_OBJECTS_FULLPIPE_//
 
-// *** 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_tsage.mmp.in b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
index c0705d7aad..e18db61683 100644
--- a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
@@ -32,11 +32,8 @@
 
 TARGET          scummvm_tsage.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
-// -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
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\tsage
 
 //STOP_AUTO_OBJECTS_TSAGE_//
 
-// *** 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