From a3414e058590bfd162a42c4756a474da1f2c6794 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Mon, 21 May 2007 21:15:33 +0000
Subject: Updated makefiles for Symbian OS to handle duplicate filenames with
 in Symbians limited amount of makefiles.

svn-id: r26906
---
 backends/platform/symbian/AdaptAllMMPs.pl            | 8 +++++---
 backends/platform/symbian/S60/ScummVM_S60.mmp.in     | 3 +++
 backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in | 3 +++
 backends/platform/symbian/S80/ScummVM_S80.mmp.in     | 3 +++
 backends/platform/symbian/S90/Scummvm_S90.mmp.in     | 3 +++
 backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in   | 3 +++
 backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in   | 3 +++
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 4c4a90967f..a692017d05 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -64,14 +64,16 @@ my @excludes_snd = (
 	"tables.cpp",
 	"freeverb.cpp"
 ); 
-my @excludes_gui = ( 
+
+my @excludes_graphics = ( 
+"iff.cpp"
 ); 
 
 #arseModule(mmpStr,		dirStr,		ifdefArray,		[exclusionsArray])
 ParseModule("_base",	"base",		\@section_empty); # now in ./TRG/ScummVM_TRG.mmp, these never change anyways...
 ParseModule("_base",	"common",	\@section_empty);
-ParseModule("_base",	"gui",		\@section_empty,		\@excludes_gui);
-ParseModule("_base",	"graphics",	\@section_empty);
+ParseModule("_base",	"gui",		\@section_empty);
+ParseModule("_base",	"graphics",	\@section_empty,		\@excludes_graphics);
 ParseModule("_base",	"sound",	\@section_empty,		\@excludes_snd);
 
 chdir("engines/");
diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
index d65aa88423..cf91b4b14e 100644
--- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in
+++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
@@ -94,6 +94,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index c680db130f..eebd4764f5 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -114,6 +114,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 LIBRARY cone.lib  eikcore.lib 
 LIBRARY euser.lib apparc.lib fbscli.lib  
diff --git a/backends/platform/symbian/S80/ScummVM_S80.mmp.in b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
index 8825662575..4bcb64060b 100644
--- a/backends/platform/symbian/S80/ScummVM_S80.mmp.in
+++ b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
@@ -92,6 +92,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/platform/symbian/S90/Scummvm_S90.mmp.in b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
index fecbfe4b82..e55acc63b1 100644
--- a/backends/platform/symbian/S90/Scummvm_S90.mmp.in
+++ b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
@@ -92,6 +92,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
index 62c3eb3aa2..c3ebae01d7 100644
--- a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
+++ b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
@@ -91,6 +91,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 7fe7798080..8620237b3a 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -115,6 +115,9 @@ SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
 
+// Special for graphics
+source graphics\iff.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
-- 
cgit v1.2.3