From 7c3588ec2a74aa75e3e1a06849b751b3c203d42a Mon Sep 17 00:00:00 2001
From: anotherguest
Date: Mon, 25 Nov 2013 16:43:11 +0100
Subject: SYMBIAN OS:Added new engines, updated resolution support. Version
 number changes

---
 backends/platform/symbian/src/SymbianOS.cpp | 30 +++++++++++++++++++++++++++++
 backends/platform/symbian/src/SymbianOS.h   |  2 +-
 backends/platform/symbian/src/portdefs.h    |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'backends/platform/symbian/src')

diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index b1bd976f9e..101b216493 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -178,6 +178,31 @@ RFs& OSystem_SDL_Symbian::FsSession() {
 	return *_RFs;
 }
 
+void OSystem_SDL_Symbian::initSize(uint w, uint h, const Graphics::PixelFormat *format ) {
+	if(w != 640 && w != 320) {
+		if(w > 320) {
+			w = 640;
+		}
+		else {
+			w = 320;
+		}			
+	}
+
+	if(h != 480 && h != 400 && h != 240 && h != 200) {
+		if(h > 400) {
+			h = 480;
+		} else if(h > 240){
+			h = 400;
+		} else if(h > 200) {
+			h = 240;
+		} else {
+			h = 200;
+		}
+	}
+
+	ModularBackend::initSize(w, h, format);
+}
+
 // Symbian bsearch implementation is flawed
 void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
 	// Perform binary search
@@ -197,3 +222,8 @@ void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size
 
 	return NULL;
 }
+
+int remove(const char *path)
+{
+	return unlink(path);
+}
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 74a102dc15..89ae0d825c 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -39,7 +39,7 @@ public:
 	virtual bool setGraphicsMode(const char *name);
 	virtual Common::String getDefaultConfigFileName();
 	virtual void setupIcon();
-
+	virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format );
 	/**
 	 * Returns reference to File session
 	 */
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 1f9128a54f..f69a90e009 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -60,6 +60,8 @@ typedef signed long int int32;
 #define SMALL_SCREEN_DEVICE
 
 #define DISABLE_COMMAND_LINE
+#define USE_RGB_COLOR
+int remove(const char *path);
 
 #if defined(USE_TREMOR) && !defined(USE_VORBIS)
 #define USE_VORBIS // make sure this one is defined together with USE_TREMOR!
-- 
cgit v1.2.3


From f4137df940c1f0532742f2eb1894db2947944f66 Mon Sep 17 00:00:00 2001
From: anotherguest
Date: Tue, 26 Nov 2013 10:39:46 +0100
Subject: SYMBIAN OS:Removed resolution fix from Symbian OS Backend, handle
 this in SDL backend instead. Add more engines for the split build.

---
 backends/platform/symbian/src/SymbianOS.cpp | 25 -------------------------
 backends/platform/symbian/src/SymbianOS.h   |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)

(limited to 'backends/platform/symbian/src')

diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 101b216493..ead85a933e 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -178,31 +178,6 @@ RFs& OSystem_SDL_Symbian::FsSession() {
 	return *_RFs;
 }
 
-void OSystem_SDL_Symbian::initSize(uint w, uint h, const Graphics::PixelFormat *format ) {
-	if(w != 640 && w != 320) {
-		if(w > 320) {
-			w = 640;
-		}
-		else {
-			w = 320;
-		}			
-	}
-
-	if(h != 480 && h != 400 && h != 240 && h != 200) {
-		if(h > 400) {
-			h = 480;
-		} else if(h > 240){
-			h = 400;
-		} else if(h > 200) {
-			h = 240;
-		} else {
-			h = 200;
-		}
-	}
-
-	ModularBackend::initSize(w, h, format);
-}
-
 // Symbian bsearch implementation is flawed
 void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
 	// Perform binary search
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 89ae0d825c..74a102dc15 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -39,7 +39,7 @@ public:
 	virtual bool setGraphicsMode(const char *name);
 	virtual Common::String getDefaultConfigFileName();
 	virtual void setupIcon();
-	virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format );
+
 	/**
 	 * Returns reference to File session
 	 */
-- 
cgit v1.2.3


From ae6efb09b7d11b8f64a5e7d7cc23de645f4c4515 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 1 Jan 2014 12:44:08 +0200
Subject: JANITORIAL: Update copyright year

---
 backends/platform/symbian/src/ScummVm.hrh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/symbian/src')

diff --git a/backends/platform/symbian/src/ScummVm.hrh b/backends/platform/symbian/src/ScummVm.hrh
index c43a9da118..316e4d08f6 100644
--- a/backends/platform/symbian/src/ScummVm.hrh
+++ b/backends/platform/symbian/src/ScummVm.hrh
@@ -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-2013 The ScummVM project
+ * Copyright (C) 2005-2014 The ScummVM Team
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
-- 
cgit v1.2.3


From 1b5c324811c06b1128883ada7763f1f14c85afd8 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:25 +0100
Subject: SYMBIAN: Make GPL headers consistent in themselves.

---
 backends/platform/symbian/src/ScummApp.cpp       | 1 +
 backends/platform/symbian/src/ScummApp.h         | 1 +
 backends/platform/symbian/src/SymbianActions.cpp | 4 ++--
 backends/platform/symbian/src/SymbianActions.h   | 4 ++--
 backends/platform/symbian/src/SymbianMain.cpp    | 4 ++--
 backends/platform/symbian/src/SymbianOS.cpp      | 1 +
 backends/platform/symbian/src/SymbianOS.h        | 1 +
 backends/platform/symbian/src/portdefs.h         | 1 +
 8 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'backends/platform/symbian/src')

diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index b952177f9a..5256c81dcc 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -17,6 +17,7 @@
  * 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.
+ *
  */
 
 #include "backends/platform/symbian/src/ScummApp.h"
diff --git a/backends/platform/symbian/src/ScummApp.h b/backends/platform/symbian/src/ScummApp.h
index 00d03e6d7b..db643f61b6 100644
--- a/backends/platform/symbian/src/ScummApp.h
+++ b/backends/platform/symbian/src/ScummApp.h
@@ -17,6 +17,7 @@
  * 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.
+ *
  */
 
 #ifndef SCUMMAPP_H
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index c47bd93772..0810b382d2 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -8,12 +8,12 @@
  * 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.
diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h
index 2b65c6c950..fc68091c74 100644
--- a/backends/platform/symbian/src/SymbianActions.h
+++ b/backends/platform/symbian/src/SymbianActions.h
@@ -8,12 +8,12 @@
  * 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.
diff --git a/backends/platform/symbian/src/SymbianMain.cpp b/backends/platform/symbian/src/SymbianMain.cpp
index 8da2b239f4..d7ad26d769 100644
--- a/backends/platform/symbian/src/SymbianMain.cpp
+++ b/backends/platform/symbian/src/SymbianMain.cpp
@@ -8,12 +8,12 @@
  * 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.
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index ead85a933e..1fca7f5df5 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -17,6 +17,7 @@
  * 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.
+ *
  */
 
 #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 74a102dc15..57a471f1a9 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -17,6 +17,7 @@
  * 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.
+ *
  */
 
 #ifndef PLATFORM_SDL_SYMBIAN_H
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index f69a90e009..1fb941963b 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -17,6 +17,7 @@
  * 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.
+ *
  */
 
 #ifndef SYMBIAN_PORTDEFS_H
-- 
cgit v1.2.3