Updated with latest from trunk

svn-id: r53976

5 files changed, 16 insertions, 10 deletions

diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index a3ce692368..01af5e7fd9 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -27,7 +27,7 @@
 
 #define _PAGESIZE_ 0x1000
 
-#if defined (__WINS__) && !defined (__SERIES60_30__) && !defined (UIQ3)
+#if defined (__WINS__) && !defined (S60V3) && !defined (UIQ3)
 extern "C" int _chkstk(int /*a*/) {
 _asm {
 	push ecx
diff --git a/backends/platform/symbian/src/ScummApp.h b/backends/platform/symbian/src/ScummApp.h
index 8cfdbdb92f..cca8e2a7c9 100644
--- a/backends/platform/symbian/src/ScummApp.h
+++ b/backends/platform/symbian/src/ScummApp.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef ScummAPPH
-#define ScummAPPH
+#ifndef SCUMMAPP_H
+#define SCUMMAPP_H
 
 #include <eikapp.h>
 #include <e32base.h>
diff --git a/backends/platform/symbian/src/ScummVMApp.h b/backends/platform/symbian/src/ScummVMApp.h
index 6796024e1e..aee098f989 100644
--- a/backends/platform/symbian/src/ScummVMApp.h
+++ b/backends/platform/symbian/src/ScummVMApp.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef ScummVMapph
-#define ScummVMapph
+#ifndef SCUMMVMAPP_H
+#define SCUMMVMAPP_H
 
 #include <eikapp.h>
 #include <e32base.h>
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index d63c9fe044..50ab7e00b1 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -140,9 +140,6 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian() :_channels(0),_stereo_mix_buffer(0) {
 }
 
 void OSystem_SDL_Symbian::initBackend() {
-	// First set the extrapath (for installed dat files etc)
-	ConfMan.set("extrapath", Symbian::GetExecutablePath());
-
 	// Calculate the default savepath
 	Common::String savePath;
 	savePath = Symbian::GetExecutablePath();
@@ -183,6 +180,13 @@ void OSystem_SDL_Symbian::initBackend() {
 	initZones();
 }
 
+void OSystem_SDL_Symbian::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+	Common::FSNode pluginsNode(Symbian::GetExecutablePath());
+	if (pluginsNode.exists() && pluginsNode.isDirectory()) {
+			s.add("SYMBIAN_DATAFOLDER", new Common::FSDirectory(Symbian::GetExecutablePath()), priority);
+		}
+}
+
 OSystem_SDL_Symbian::~OSystem_SDL_Symbian() {
 	delete[] _stereo_mix_buffer;
 }
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 42929f8029..85b5e131da 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef SDLSYMBIANH
-#define SDLSYMBIANH
+#ifndef SDLSYMBIAN_H
+#define SDLSYMBIAN_H
 
 #include "backends/platform/sdl/sdl.h"
 
@@ -61,6 +61,8 @@ public:
 
 	// Returns reference to File session
 	RFs& FsSession();
+
+	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
 protected:
 	//
 	// The mixer callback function.