Preparing for new Build structure and with Sevs code formatting fixes + fixes for those fixes.

svn-id: r19737

48 files changed, 0 insertions, 3068 deletions

diff --git a/backends/epoc/build/.placeholder b/backends/epoc/build/.placeholder
deleted file mode 100644
index 4af1e27cc7..0000000000
--- a/backends/epoc/build/.placeholder
+++ /dev/null
@@ -1 +0,0 @@
->> SumthinWicked *grins* <<
diff --git a/backends/epoc/build/S60/BLD.INF b/backends/epoc/build/S60/BLD.INF
deleted file mode 100644
index 0285a5da5b..0000000000
--- a/backends/epoc/build/S60/BLD.INF
+++ /dev/null
@@ -1,14 +0,0 @@
-PRJ_PLATFORMS
-WINS ARMI // ARM4 THUMB
-
-PRJ_MMPFILES
-..\scummvm_base.mmp
-..\scummvm_scumm.mmp
-..\scummvm_simon.mmp
-..\scummvm_sky.mmp
-..\scummvm_queen.mmp
-..\scummvm_gob.mmp
-..\scummvm_saga.mmp
-.\EScummVM_S60.mmp
-.\EScummVM_S60_App.mmp
-.\EScummVM_S60_Exe.mmp
diff --git a/backends/epoc/build/S60/EScummVM.rss b/backends/epoc/build/S60/EScummVM.rss
deleted file mode 100644
index 5255b87b32..0000000000
--- a/backends/epoc/build/S60/EScummVM.rss
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script 
-#include <eikon.rh>
-#include "..\..\Scummvm.hrh"
-// Include the standard Eikon resource ids 
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
-	{
-	}
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
-	{
-	}
-
diff --git a/backends/epoc/build/S60/EScummVMS60.rss b/backends/epoc/build/S60/EScummVMS60.rss
deleted file mode 100644
index 200dddcfcf..0000000000
--- a/backends/epoc/build/S60/EScummVMS60.rss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header:
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script 
-#include <eikon.rh>
-#include "..\..\Scummvm.hrh"
-// Include the standard Eikon resource ids 
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
-	{
-	}
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
-	{
-		menubar = r_scum_menubar;
-	}
-
-RESOURCE MENU_BAR r_scum_menubar                                         // *** Menu bar
-{
-      titles =
-    {
-		MENU_TITLE { menu_pane = r_scum_menu; txt = "ScummVM"; }
-	};
-}
-
-RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu 
-{
-	items =
-	{
-	
-		MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
-    };
-}
diff --git a/backends/epoc/build/S60/EScummVM_080.pkg b/backends/epoc/build/S60/EScummVM_080.pkg
deleted file mode 100644
index e4d4aacd4b..0000000000
--- a/backends/epoc/build/S60/EScummVM_080.pkg
+++ /dev/null
@@ -1,36 +0,0 @@
-;;;
-;;; EScummVM .PKG file for .SIS gegeration
-;;;
-
-; Languages
-;&EN
-
-; UID is the app's UID
-#{"EScummVM S60"},(0x101f9b57),0,80,3
-
-; Platform type
-(0x101F6F88), 0, 0, 0, {"Series60ProductID"}
-
-; Signature
-*"..\EScummVM.key","..\EScummVM.cer"
-
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\EScummVMS60.app"-"!:\system\apps\EScummVMS60\EScummVMS60.app"
-"\epoc32\release\armi\urel\EScummVM.exe"-"!:\system\apps\EScummVMS60\EScummVM.exe"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\EScummVMS60\EScummVMS60.aif"-"!:\system\apps\EScummVMS60\EScummVMS60.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\EScummVMS60\EScummVMS60.rsc"-"!:\system\apps\EScummVMS60\EScummVMS60.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\EScummVM\scummvm.ini",FN
-""-"c:\documents\EScummVM\scummvm.stdout.txt",FN
-""-"c:\documents\EScummVM\scummvm.stderr.txt",FN
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/epoc/build/S60/EScummVM_S60.mmp b/backends/epoc/build/S60/EScummVM_S60.mmp
deleted file mode 100644
index 9f8660a64e..0000000000
--- a/backends/epoc/build/S60/EScummVM_S60.mmp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-//
-// EPOC S60 MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          ESCUMMVM.APP
-TARGETPATH      system\apps\EScummVM
-TARGETTYPE      app
-				// /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			MSVC  /QIfist /Ob1 /Oy /GF 
-//OPTION			GCC -O3 -funroll-loops -finline-functions -ffast-math -frerun-loop-opt -fconserve-space -fexpensive-optimizations -Wno-multichar -Wno-reorder
-
-EPOCHEAPSIZE	1024	5242880
-EPOCSTACKSIZE	0x80008000 // this enables ECompXL app compression
-AIF			EScummVm.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // mine still fails: I think it's because I have JRE 1.5 instead of 1.3 :P
-UID             0x100039ce 0x101f9b57
-
-RESOURCE		EScummVM.rss
-
-MACRO			S60
-MACRO			EPOC_AS_APP
-MACRO			NONSTANDARD_PORT
-
-// these need too high a resolution
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-// these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
-
-// *** Static Libraries
-
-STATICLIBRARY scummvm_scumm.lib
-STATICLIBRARY scummvm_simon.lib
-STATICLIBRARY scummvm_sky.lib
-STATICLIBRARY scummvm_queen.lib
-STATICLIBRARY scummvm_gob.lib
-STATICLIBRARY scummvm_saga.lib
-STATICLIBRARY scummvm_base.lib
-
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
-STATICLIBRARY esdl.lib
-#if !defined(WINS)
-STATICLIBRARY egcc.lib // for __fixunsdfsi
-#endif
-// *** Include paths
-
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
-USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\epoc ..\..\..\..\backends\sdl ..\..\..\..\sound
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..\..
-
-//START_AUTO_OBJECTS_BASE_// Updated @ Tue May 31 18:35:38 2005
-SOURCE base\engine.cpp
-SOURCE base\gameDetector.cpp
-SOURCE base\main.cpp
-SOURCE base\plugins.cpp
-//STOP_AUTO_OBJECTS_BASE_//
-
-// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\epoc\SymbianOS.cpp 
-SOURCE backends\epoc\SymbianActions.cpp 
-SOURCE backends\epoc\ScummApp.cpp
-
-SOURCE gui\Key.cpp
-SOURCE gui\KeysDialog.cpp
-SOURCE gui\Actions.cpp
-// *** Dynamic Libraries
-
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-LIBRARY AVKON.LIB
-
diff --git a/backends/epoc/build/S60/EScummVM_S60_App.mmp b/backends/epoc/build/S60/EScummVM_S60_App.mmp
deleted file mode 100644
index 024ac9ce21..0000000000
--- a/backends/epoc/build/S60/EScummVM_S60_App.mmp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// MAKEFILE.MMP S60 ScummVM Launcher
-//
-
-TARGET			EScummVMS60.app
-TARGETPATH		system\apps\EScummVMS60
-TARGETTYPE		app
-
-UID				0x100039ce 0x101f9b57
-RESOURCE		ESCUMMVMS60.rss
-
-SOURCEPATH		.
-USERINCLUDE		.
-SYSTEMINCLUDE	\epoc32\include \epoc32\include\libc
-
-// app source
-SOURCE ScummVMApp.cpp
-sourcepath ..
-AIF			EScummVmS60.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // still fails?
-// libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
-LIBRARY efsrv.lib  apgrfx.lib
-LIBRARY	avkon.lib
diff --git a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
deleted file mode 100644
index d2ca20b3ab..0000000000
--- a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-//
-// EPOC S60 MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-#if defined(WINS)
-	TARGET          EScummVM.dll
-#else
-	TARGET          EScummVM.exe
-#endif
-TARGETPATH      system\apps\EScummVMs60
-TARGETTYPE      EXEDLL
-
-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
-
-EPOCSTACKSIZE	0x00008000
-EPOCHEAPSIZE	1024	8192000
-
-MACRO			S60
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 20:01:17 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-
-// automagically enabled static libs from macros above
-STATICLIBRARY	scummvm_scumm.lib
-STATICLIBRARY	scummvm_simon.lib
-STATICLIBRARY	scummvm_sky.lib
-STATICLIBRARY	scummvm_queen.lib
-STATICLIBRARY	scummvm_gob.lib
-STATICLIBRARY	scummvm_saga.lib
-STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
-STATICLIBRARY	libmad.lib
-STATICLIBRARY	zlib.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** Static Libraries
-
-STATICLIBRARY esdl_exe.lib
-#if !defined(WINS)
-STATICLIBRARY egcc.lib // for __fixunsdfsi
-#endif
-
-// *** Include paths
-
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
-USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\epoc ..\..\..\..\backends\sdl ..\..\..\..\sound
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..\..
-
-//START_AUTO_OBJECTS_BASE_// Updated @ Tue May 31 18:35:38 2005
-SOURCE base\engine.cpp
-SOURCE base\gameDetector.cpp
-SOURCE base\main.cpp
-SOURCE base\plugins.cpp
-//STOP_AUTO_OBJECTS_BASE_//
-
-// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\epoc\SymbianOS.cpp 
-SOURCE backends\epoc\SymbianActions.cpp 
-SOURCE backends\epoc\ScummApp.cpp
-
-SOURCE gui\Key.cpp
-SOURCE gui\KeysDialog.cpp
-SOURCE gui\Actions.cpp
-
-// *** Dynamic Libraries
-
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-library avkon.lib
diff --git a/backends/epoc/build/S60/ScummVMApp.cpp b/backends/epoc/build/S60/ScummVMApp.cpp
deleted file mode 100644
index 638721e661..0000000000
--- a/backends/epoc/build/S60/ScummVMApp.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#include "backends/epoc/build/S60/ScummVMapp.h"
-#include <escummvms60.rsg>
-#include <apgcli.h>
-#include <eikdll.h>
-
-EXPORT_C CApaApplication *NewApplication() {
-	return (new CScummVM);
-}
-
-CScummVM::CScummVM() {
-}
-
-CScummVM::~CScummVM() {
-}
-
-CApaDocument *CScummVM::CreateDocumentL() {
-	return new (ELeave)CScummVMDoc(*this);
-}
-
-TUid CScummVM::AppDllUid() const {
-	return TUid::Uid(0x101f9b57);
-}
-
-CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CAknDocument(aApp) {
-}
-
-CScummVMDoc::~CScummVMDoc() {
-}
-
-CEikAppUi *CScummVMDoc::CreateAppUiL() {
-	return new (ELeave)CScummVMUi;
-}
-
-void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
-	if (aForeground) {
-		BringUpEmulatorL();
-	}
-}
-
-CScummVMUi::CScummVMUi() {
-}
-
-CScummVMUi::~CScummVMUi() {
-	if(iWatcher) {
-		iThreadWatch.LogonCancel(iWatcher->iStatus);
-		iWatcher->Cancel();
-	}
-	delete iWatcher;
-
-	iThreadWatch.Close();
-}
-
-void CScummVMUi::ConstructL() {
-	BaseConstructL();
-	TBuf<128> startFile;
-	startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
-	TParse parser;
-	parser.Set(startFile, NULL, NULL);
-
-	startFile = parser.DriveAndPath();
-#ifndef __WINS__
-	startFile.Append( _L("ScummVM.exe"));
-#else
-	startFile.Append( _L("ScummVM.dll"));
-#endif
-	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
-	RApaLsSession lsSession;
-
-	lsSession.Connect();
-	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine, iThreadId);
-	CleanupStack::PopAndDestroy(); //close lsSession
-	CleanupStack::PopAndDestroy(cmdLine);
-
-	User::After(500000); // Let the application start
-
-	TApaTaskList taskList(iEikonEnv->WsSession());
-
-	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
-	myTask.SendToBackground();
-
-	TApaTask exeTask=taskList.FindByPos(0);
-	iExeWgId=exeTask.WgId();
-
-	if(iExeWgId == myTask.WgId()) { // Should n't be the same
-		Exit();
-	}
-
-	if(iThreadWatch.Open(iThreadId) == KErrNone) {
-		iWatcher = new (ELeave)CScummWatcher;
-		iWatcher->iAppUi=this;
-		iThreadWatch.Logon(iWatcher->iStatus);
-	}
-}
-
-CScummWatcher::CScummWatcher():CActive(EPriorityStandard) {
-	CActiveScheduler::Add(this);
-	iStatus=KRequestPending;
-	SetActive();
-}
-
-CScummWatcher::~CScummWatcher() {
-}
-
-void CScummWatcher::DoCancel() {
-}
-
-void CScummWatcher::RunL() {
-	iAppUi->HandleCommandL(EEikCmdExit);
-}
-
-void CScummVMUi::BringUpEmulatorL() {
-	RThread thread;
-
-	if (thread.Open(iThreadId) == KErrNone) {
-		thread.Close();
-		TApaTask apaTask(iEikonEnv->WsSession());
-		apaTask.SetWgId(iExeWgId);
-		apaTask.BringToForeground();
-	} else {
-		iExeWgId = -1;
-	}
-}
-
-void CScummVMUi::HandleCommandL(TInt aCommand) {
-	switch(aCommand) {
-	case EEikCmdExit:
-		{
-			RThread thread;
-
-			if(thread.Open(iThreadId) == KErrNone) {
-				thread.Terminate(0);
-				thread.Close();
-			}
-			Exit();
-		}
-		break;
-	}
-}
-
-GLDEF_C TInt E32Dll(TDllReason) {
-	return KErrNone;
-}
diff --git a/backends/epoc/build/S60/ScummVMApp.h b/backends/epoc/build/S60/ScummVMApp.h
deleted file mode 100644
index 8cb622cac6..0000000000
--- a/backends/epoc/build/S60/ScummVMApp.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#ifndef ScummVMapps60h
-#define ScummVMapps60h
-
-#include <aknapp.h>
-#include <eikapp.h>
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eikenv.h>
-#include <coeview.h>
-#include <eikappui.h>
-
-class CScummVM:public CEikApplication {
-public:
-	CScummVM();
-	~CScummVM();
-
-	CApaDocument *CreateDocumentL();
-	TUid AppDllUid() const;
-};
-
-
-#include <AKNdoc.h>
-
-class CScummVMDoc:public  CAknDocument {
-public:
-	CScummVMDoc(CEikApplication &aApplicaiton);
-	~CScummVMDoc();
-
-	CEikAppUi *CreateAppUiL();
-	void ConstructL();
-};
-
-#include <aknappui.h>
-class CScummVMUi;
-class CScummWatcher : public CActive {
-public:
-	CScummWatcher();
-	~CScummWatcher();
-
-	void DoCancel();
-	void RunL();
-	CScummVMUi *iAppUi;
-};
-
-class CScummVMUi : public CAknAppUi {
-public:
-	CScummVMUi();
-	~CScummVMUi();
-
-	void ConstructL();
-	void HandleCommandL(TInt aCommand);
-	void HandleForegroundEventL(TBool aForeground);
-	void BringUpEmulatorL();
-
-private:
-	TThreadId iThreadId;
-	TInt iExeWgId;
-	RThread iThreadWatch;
-	CScummWatcher *iWatcher;
-};
-#endif
diff --git a/backends/epoc/build/S80/BLD.INF b/backends/epoc/build/S80/BLD.INF
deleted file mode 100644
index 689c15e80a..0000000000
--- a/backends/epoc/build/S80/BLD.INF
+++ /dev/null
@@ -1,13 +0,0 @@
-PRJ_PLATFORMS
-WINS ARMI // ARM4 THUMB
-
-PRJ_MMPFILES
-..\scummvm_base.mmp
-..\scummvm_scumm.mmp
-..\scummvm_simon.mmp
-..\scummvm_sky.mmp
-..\scummvm_queen.mmp
-..\scummvm_gob.mmp
-..\scummvm_saga.mmp
-.\EScummVM_S80.mmp
-.\EScummVM_S80_App.mmp
diff --git a/backends/epoc/build/S80/EScummVM_080.pkg b/backends/epoc/build/S80/EScummVM_080.pkg
deleted file mode 100644
index b2a130da05..0000000000
--- a/backends/epoc/build/S80/EScummVM_080.pkg
+++ /dev/null
@@ -1,30 +0,0 @@
-;;;
-;;; EScummVM .PKG file for .SIS gegeration
-;;;
-
-; Languages
-;&EN
-
-; UID is the app's UID
-#{"EScummVM S80"},(0x101f9b57),0,80,3
-
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\EScummVMS80.app"-"!:\system\apps\EScummVMS80\EScummVMS80.app"
-"\epoc32\release\armi\urel\EScummVM.exe"-"!:\system\apps\EScummVMS80\EScummVM.exe"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\EScummVMS80\EScummVMS80.aif"-"!:\system\apps\EScummVMS80\EScummVMS80.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\EScummVMS80\EScummVMS80.rsc"-"!:\system\apps\EScummVMS80\EScummVMS80.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\EScummVM\scummvm.ini",FN
-""-"c:\documents\EScummVM\scummvm.stdout.txt",FN
-""-"c:\documents\EScummVM\scummvm.stderr.txt",FN
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/epoc/build/S80/EScummVM_S80.mmp b/backends/epoc/build/S80/EScummVM_S80.mmp
deleted file mode 100644
index 615b023c9a..0000000000
--- a/backends/epoc/build/S80/EScummVM_S80.mmp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC S80 MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-#if defined(WINS)
-	TARGET          EScummVM.dll
-#else
-	TARGET          EScummVM.exe
-#endif
-TARGETPATH      system\apps\EScummVMs80
-TARGETTYPE      EXEDLL
-
-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
-
-EPOCSTACKSIZE	0x00008000
-EPOCHEAPSIZE	1024	8192000
-
-MACRO			S80
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-
-// automagically enabled static libs from macros above
-STATICLIBRARY	scummvm_scumm.lib
-STATICLIBRARY	scummvm_simon.lib
-STATICLIBRARY	scummvm_sky.lib
-STATICLIBRARY	scummvm_queen.lib
-STATICLIBRARY	scummvm_gob.lib
-STATICLIBRARY	scummvm_saga.lib
-STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
-STATICLIBRARY	libmad.lib
-STATICLIBRARY	zlib.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** Static Libraries
-
-STATICLIBRARY esdl.lib
-#if !defined(WINS)
-STATICLIBRARY egcc.lib // for __fixunsdfsi
-#endif
-
-// *** Include paths
-
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
-USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\epoc ..\..\..\..\backends\sdl ..\..\..\..\sound
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..\..
-
-//START_AUTO_OBJECTS_BASE_// Updated @ Tue May 31 18:35:38 2005
-SOURCE base\engine.cpp
-SOURCE base\gameDetector.cpp
-SOURCE base\main.cpp
-SOURCE base\plugins.cpp
-//STOP_AUTO_OBJECTS_BASE_//
-
-// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\epoc\SymbianOS.cpp 
-SOURCE backends\epoc\SymbianActions.cpp 
-SOURCE backends\epoc\ScummApp.cpp
-
-SOURCE gui\Key.cpp
-SOURCE gui\KeysDialog.cpp
-SOURCE gui\Actions.cpp
-
-// *** Dynamic Libraries
-
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-
diff --git a/backends/epoc/build/S80/EScummVM_S80_App.mmp b/backends/epoc/build/S80/EScummVM_S80_App.mmp
deleted file mode 100644
index 505b8590b7..0000000000
--- a/backends/epoc/build/S80/EScummVM_S80_App.mmp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// MAKEFILE.MMP S80 ScummVM Launcher
-//
-
-TARGET			EScummVMS80.app
-TARGETPATH		system\apps\EScummVMS80
-TARGETTYPE		app
-
-UID				0x100039ce 0x101f9b57
-RESOURCE		ESCUMMVMS80.rss
-
-SOURCEPATH		.
-USERINCLUDE		.
-SYSTEMINCLUDE	\epoc32\include \epoc32\include\libc
-
-// app source
-SOURCE ScummVMApp.cpp
-sourcepath ..
-AIF			EScummVmS80.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // still fails?
-// libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
-LIBRARY efsrv.lib  apgrfx.lib
diff --git a/backends/epoc/build/S80/EScummvmS80.rss b/backends/epoc/build/S80/EScummvmS80.rss
deleted file mode 100644
index a24d00f296..0000000000
--- a/backends/epoc/build/S80/EScummvmS80.rss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script 
-#include <eikon.rh>
-#include "..\..\Scummvm.hrh"
-// Include the standard Eikon resource ids 
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
-	{
-	}
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
-	{
-		menubar = r_scum_menubar;
-	}
-
-RESOURCE MENU_BAR r_scum_menubar                                         // *** Menu bar
-{
-      titles =
-    {
-		MENU_TITLE { menu_pane = r_scum_menu; txt = "ScummVM"; }
-	};
-}
-
-RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu 
-{
-	items =
-	{
-	
-		MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
-    };
-}
diff --git a/backends/epoc/build/S80/ScummVMApp.cpp b/backends/epoc/build/S80/ScummVMApp.cpp
deleted file mode 100644
index 15db5fea12..0000000000
--- a/backends/epoc/build/S80/ScummVMApp.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#include "backends/epoc/build/S80/ScummVMapp.h"
-#include <escummvms80.rsg>
-#include <apgcli.h>
-#include <eikdll.h>
-#include <apgtask.h>
-
-EXPORT_C CApaApplication *NewApplication() {
-	return (new CScummVM);
-}
-
-CScummVM::CScummVM() {
-}
-
-CScummVM::~CScummVM() {
-}
-
-CApaDocument *CScummVM::CreateDocumentL() {
-	return new (ELeave)CScummVMDoc(*this);
-}
-
-TUid CScummVM::AppDllUid() const {
-	return TUid::Uid(0x101f9b57);
-}
-
-CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CEikDocument(aApp) {
-}
-
-CScummVMDoc::~CScummVMDoc() {
-}
-
-CEikAppUi *CScummVMDoc::CreateAppUiL() {
-	return new (ELeave)CScummVMUi;
-}
-
-void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
-	if(aForeground) {
-		BringUpEmulatorL();
-	}
-}
-
-CScummVMUi::CScummVMUi() {
-}
-
-CScummVMUi::~CScummVMUi() {
-	if(iWatcher) {
-		iThreadWatch.LogonCancel(iWatcher->iStatus);
-		iWatcher->Cancel();
-	}
-	delete iWatcher;
-
-	iThreadWatch.Close();
-}
-
-void CScummVMUi::ConstructL() {
-	BaseConstructL();
-	TBuf<128> startFile;
-	startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
-	TParse parser;
-	parser.Set(startFile,NULL,NULL);
-
-	startFile = parser.DriveAndPath();
-#ifndef __WINS__
-	startFile.Append( _L("ScummVM.exe"));
-#else
-	startFile.Append( _L("ScummVM.dll"));
-#endif
-	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
-	RApaLsSession lsSession;
-
-	lsSession.Connect();
-	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine, iThreadId);
-
-	CleanupStack::PopAndDestroy(); // close lsSession
-	CleanupStack::PopAndDestroy(cmdLine);
-
-	User::After(500000); // Let the application start
-
-	TApaTaskList taskList(iEikonEnv->WsSession());
-
-	TApaTask myTask = taskList.FindApp(TUid::Uid(0x101f9b57));
-	myTask.SendToBackground();
-
-	TApaTask exeTask = taskList.FindByPos(0);
-
-	iExeWgId = exeTask.WgId();
-	exeTask.BringToForeground();
-
-	if(iExeWgId == myTask.WgId()) { // Should n't be the same
-		Exit();
-	}
-	if(iThreadWatch.Open(iThreadId) == KErrNone) {
-		iWatcher = new (ELeave)CScummWatcher;
-		iWatcher->iAppUi = this;
-		iThreadWatch.Logon(iWatcher->iStatus);
-	}
-}
-
-CScummWatcher::CScummWatcher() : CActive(EPriorityStandard) {
-	CActiveScheduler::Add(this);
-	iStatus = KRequestPending;
-	SetActive();
-}
-
-CScummWatcher::~CScummWatcher() {
-}
-
-void CScummWatcher::DoCancel() {
-}
-
-void CScummWatcher::RunL() {
-	iAppUi->HandleCommandL(EEikCmdExit);
-}
-
-void CScummVMUi::BringUpEmulatorL() {
-	RThread thread;
-	if(thread.Open(iThreadId) == KErrNone) {
-		thread.Close();
-		TApaTask apaTask(iEikonEnv->WsSession());
-		apaTask.SetWgId(iExeWgId);
-		apaTask.BringToForeground();
-	} else {
-		iExeWgId = -1;
-	}
-}
-
-void CScummVMUi::HandleCommandL(TInt aCommand) {
-	switch(aCommand) {
-	case EEikCmdExit:
-		{
-			RThread thread;
-			if(thread.Open(iThreadId) == KErrNone) {
-				thread.Terminate(0);
-				thread.Close();
-			}
-			Exit();
-		}
-		break;
-	}
-}
-
-GLDEF_C TInt E32Dll(TDllReason) {
-	return KErrNone;
-}
diff --git a/backends/epoc/build/S80/ScummVMApp.h b/backends/epoc/build/S80/ScummVMApp.h
deleted file mode 100644
index e297d75e9d..0000000000
--- a/backends/epoc/build/S80/ScummVMApp.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#ifndef ScummVMapps60h
-#define ScummVMapps60h
-
-#include <eikapp.h>
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eikenv.h>
-#include <coeview.h>
-#include <eikappui.h>
-
-class CScummVM : public CEikApplication {
-public:
-	CScummVM();
-	~CScummVM();
-
-	CApaDocument *CreateDocumentL();
-	TUid AppDllUid() const;
-};
-
-
-#include <eikdoc.h>
-
-class CScummVMDoc : public CEikDocument {
-public:
-	CScummVMDoc(CEikApplication &aApplicaiton);
-	~CScummVMDoc();
-
-	CEikAppUi *CreateAppUiL();
-	void ConstructL();
-};
-
-#include <eikappui.h>
-class CScummVMUi;
-class CScummWatcher : public CActive {
-public:
-	CScummWatcher();
-	~CScummWatcher();
-
-	void DoCancel();
-	void RunL();
-	CScummVMUi *iAppUi;
-};
-
-class CScummVMUi : public CEikAppUi {
-public:
-	CScummVMUi();
-	~CScummVMUi();
-
-	void ConstructL();
-	void HandleCommandL(TInt aCommand);
-	void HandleForegroundEventL(TBool aForeground);
-	void BringUpEmulatorL();
-
-private:
-	TThreadId iThreadId;
-	TInt iExeWgId;
-	RThread iThreadWatch;
-	CScummWatcher *iWatcher;
-};
-#endif
diff --git a/backends/epoc/build/S90/BLD.INF b/backends/epoc/build/S90/BLD.INF
deleted file mode 100644
index add22ac7b3..0000000000
--- a/backends/epoc/build/S90/BLD.INF
+++ /dev/null
@@ -1,13 +0,0 @@
-PRJ_PLATFORMS
-WINS ARMI // ARM4 THUMB
-
-PRJ_MMPFILES
-..\scummvm_base.mmp
-..\scummvm_scumm.mmp
-..\scummvm_simon.mmp
-..\scummvm_sky.mmp
-..\scummvm_queen.mmp
-..\scummvm_gob.mmp
-..\scummvm_saga.mmp
-.\EScummVM_S90.mmp
-.\EScummVM_S90_App.mmp
diff --git a/backends/epoc/build/S90/EScummVM_080.pkg b/backends/epoc/build/S90/EScummVM_080.pkg
deleted file mode 100644
index 1bbd364ed9..0000000000
--- a/backends/epoc/build/S90/EScummVM_080.pkg
+++ /dev/null
@@ -1,30 +0,0 @@
-;;;
-;;; EScummVM .PKG file for .SIS gegeration
-;;;
-
-; Languages
-;&EN
-
-; UID is the app's UID
-#{"EScummVM S90"},(0x101f9b57),0,80,3
-
-; Application file Launcher and actual exe
-"\epoc32\release\armi\urel\EScummVMS90.app"-"!:\system\apps\EScummVMS90\EScummVMS90.app"
-"\epoc32\release\armi\urel\EScummVM.exe"-"!:\system\apps\EScummVMS90\EScummVM.exe"
-
-; AIF application information file
-"\epoc32\data\z\system\apps\EScummVMS90\EScummVMS90.aif"-"!:\system\apps\EScummVMS90\EScummVMS90.aif"
-
-; Resource file
-"\epoc32\data\z\system\apps\EScummVMS90\EScummVMS90.rsc"-"!:\system\apps\EScummVMS90\EScummVMS90.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\EScummVM\scummvm.ini",FN
-""-"c:\documents\EScummVM\scummvm.stdout.txt",FN
-""-"c:\documents\EScummVM\scummvm.stderr.txt",FN
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/epoc/build/S90/EScummvmS90.rss b/backends/epoc/build/S90/EScummvmS90.rss
deleted file mode 100644
index a24d00f296..0000000000
--- a/backends/epoc/build/S90/EScummvmS90.rss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script 
-#include <eikon.rh>
-#include "..\..\Scummvm.hrh"
-// Include the standard Eikon resource ids 
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
-	{
-	}
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
-	{
-		menubar = r_scum_menubar;
-	}
-
-RESOURCE MENU_BAR r_scum_menubar                                         // *** Menu bar
-{
-      titles =
-    {
-		MENU_TITLE { menu_pane = r_scum_menu; txt = "ScummVM"; }
-	};
-}
-
-RESOURCE MENU_PANE r_scum_menu                                  // *** Submenu 
-{
-	items =
-	{
-	
-		MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
-    };
-}
diff --git a/backends/epoc/build/S90/EScummvm_S90.mmp b/backends/epoc/build/S90/EScummvm_S90.mmp
deleted file mode 100644
index 2859f38482..0000000000
--- a/backends/epoc/build/S90/EScummvm_S90.mmp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC S90 MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-#if defined(WINS)
-	TARGET          EScummVM.dll
-#else
-	TARGET          EScummVM.exe
-#endif
-TARGETPATH      system\apps\EScummVMs90
-TARGETTYPE      EXEDLL
-
-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
-
-EPOCSTACKSIZE	0x00008000
-EPOCHEAPSIZE	1024	8192000
-
-MACRO			S90
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-
-// automagically enabled static libs from macros above
-STATICLIBRARY	scummvm_scumm.lib
-STATICLIBRARY	scummvm_simon.lib
-STATICLIBRARY	scummvm_sky.lib
-STATICLIBRARY	scummvm_queen.lib
-STATICLIBRARY	scummvm_gob.lib
-STATICLIBRARY	scummvm_saga.lib
-STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
-STATICLIBRARY	libmad.lib
-STATICLIBRARY	zlib.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** Static Libraries
-
-STATICLIBRARY esdl.lib
-#if !defined(WINS)
-STATICLIBRARY egcc.lib // for __fixunsdfsi
-#endif
-
-// *** Include paths
-
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
-USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\epoc ..\..\..\..\backends\sdl ..\..\..\..\sound
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..\..
-
-//START_AUTO_OBJECTS_BASE_// Updated @ Tue May 31 18:35:38 2005
-SOURCE base\engine.cpp
-SOURCE base\gameDetector.cpp
-SOURCE base\main.cpp
-SOURCE base\plugins.cpp
-//STOP_AUTO_OBJECTS_BASE_//
-
-// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\epoc\SymbianOS.cpp 
-SOURCE backends\epoc\SymbianActions.cpp 
-SOURCE backends\epoc\ScummApp.cpp
-
-SOURCE gui\Key.cpp
-SOURCE gui\KeysDialog.cpp
-SOURCE gui\Actions.cpp
-
-// *** Dynamic Libraries
-
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-
diff --git a/backends/epoc/build/S90/EScummvm_S90_App.mmp b/backends/epoc/build/S90/EScummvm_S90_App.mmp
deleted file mode 100644
index 043447d5b7..0000000000
--- a/backends/epoc/build/S90/EScummvm_S90_App.mmp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// MAKEFILE.MMP S90 ScummVM Launcher
-//
-
-TARGET			EScummVMS90.app
-TARGETPATH		system\apps\EScummVMS90
-TARGETTYPE		app
-
-UID				0x100039ce 0x101f9b57
-RESOURCE		ESCUMMVMS90.rss
-
-SOURCEPATH		.
-USERINCLUDE		.
-SYSTEMINCLUDE	\epoc32\include \epoc32\include\libc
-
-// app source
-SOURCE ScummVMApp.cpp
-sourcepath ..
-AIF			EScummVmS90.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // still fails?
-// libraries
-LIBRARY cone.lib  EIKCORE.lib 
-LIBRARY euser.lib apparc.lib  
-LIBRARY efsrv.lib  apgrfx.lib
diff --git a/backends/epoc/build/S90/ScummVMApp.cpp b/backends/epoc/build/S90/ScummVMApp.cpp
deleted file mode 100644
index 1a2c89a4f6..0000000000
--- a/backends/epoc/build/S90/ScummVMApp.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#include "backends/epoc/build/S90/ScummVMapp.h"
-#include <escummvms90.rsg>
-#include <apgcli.h>
-#include <eikdll.h>
-#include <apgtask.h>
-
-EXPORT_C CApaApplication *NewApplication() {
-	return (new CScummVM);
-}
-
-CScummVM::CScummVM() {
-}
-
-CScummVM::~CScummVM() {
-}
-
-CApaDocument *CScummVM::CreateDocumentL() {
-	return new (ELeave)CScummVMDoc(*this);
-}
-
-TUid CScummVM::AppDllUid() const {
-	return TUid::Uid(0x101f9b57);
-}
-
-CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CEikDocument(aApp) {
-}
-
-CScummVMDoc::~CScummVMDoc() {
-}
-
-CEikAppUi *CScummVMDoc::CreateAppUiL() {
-	return new (ELeave)CScummVMUi;
-}
-
-void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
-	if(aForeground) {
-		BringUpEmulatorL();
-	}
-}
-
-CScummVMUi::CScummVMUi() {
-}
-
-CScummVMUi::~CScummVMUi() {
-	if(iWatcher) {
-		iThreadWatch.LogonCancel(iWatcher->iStatus);
-		iWatcher->Cancel();
-	}
-
-	delete iWatcher;
-
-	iThreadWatch.Close();
-}
-
-void CScummVMUi::ConstructL() {
-	BaseConstructL();
-	TBuf<128> startFile;
-	startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
-	TParse parser;
-	parser.Set(startFile,NULL,NULL);
-
-	startFile = parser.DriveAndPath();
-#ifndef __WINS__
-	startFile.Append( _L("ScummVM.exe"));
-#else
-	startFile.Append( _L("ScummVM.dll"));
-#endif
-	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
-	RApaLsSession lsSession;
-
-	lsSession.Connect();
-	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine, iThreadId);
-
-	CleanupStack::PopAndDestroy();//close lsSession
-	CleanupStack::PopAndDestroy(cmdLine);
-
-	User::After(500000);// Let the application start
-
-	TApaTaskList taskList(iEikonEnv->WsSession());
-
-	TApaTask myTask = taskList.FindApp(TUid::Uid(0x101f9b57));
-	myTask.SendToBackground();
-
-	TApaTask exeTask = taskList.FindByPos(0);
-
-	iExeWgId=exeTask.WgId();
-	exeTask.BringToForeground();
-
-	if(iExeWgId == myTask.WgId()) { // Should n't be the same
-		Exit();
-	}
-	if(iThreadWatch.Open(iThreadId) == KErrNone) {
-		iWatcher = new (ELeave)CScummWatcher;
-		iWatcher->iAppUi = this;
-		iThreadWatch.Logon(iWatcher->iStatus);
-	}
-}
-
-CScummWatcher::CScummWatcher() : CActive(EPriorityStandard) {
-	CActiveScheduler::Add(this);
-
-	iStatus = KRequestPending;
-	SetActive();
-}
-
-CScummWatcher::~CScummWatcher() {
-}
-
-void CScummWatcher::DoCancel() {
-}
-
-void CScummWatcher::RunL() {
-	iAppUi->HandleCommandL(EEikCmdExit);
-}
-
-void CScummVMUi::BringUpEmulatorL() {
-	RThread thread;
-
-	if(thread.Open(iThreadId) == KErrNone) {
-		thread.Close();
-		TApaTask apaTask(iEikonEnv->WsSession());
-		apaTask.SetWgId(iExeWgId);
-		apaTask.BringToForeground();
-	} else {
-		iExeWgId = -1;
-	}
-}
-
-void CScummVMUi::HandleCommandL(TInt aCommand) {
-	switch(aCommand) {
-	case EEikCmdExit:
-		{
-			RThread thread;
-			if(thread.Open(iThreadId) == KErrNone) {
-				thread.Terminate(0);
-				thread.Close();
-			}
-			Exit();
-		}
-		break;
-	}
-}
-
-GLDEF_C TInt E32Dll(TDllReason) {
-	return KErrNone;
-}
diff --git a/backends/epoc/build/S90/ScummVMApp.h b/backends/epoc/build/S90/ScummVMApp.h
deleted file mode 100644
index e297d75e9d..0000000000
--- a/backends/epoc/build/S90/ScummVMApp.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-#ifndef ScummVMapps60h
-#define ScummVMapps60h
-
-#include <eikapp.h>
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eikenv.h>
-#include <coeview.h>
-#include <eikappui.h>
-
-class CScummVM : public CEikApplication {
-public:
-	CScummVM();
-	~CScummVM();
-
-	CApaDocument *CreateDocumentL();
-	TUid AppDllUid() const;
-};
-
-
-#include <eikdoc.h>
-
-class CScummVMDoc : public CEikDocument {
-public:
-	CScummVMDoc(CEikApplication &aApplicaiton);
-	~CScummVMDoc();
-
-	CEikAppUi *CreateAppUiL();
-	void ConstructL();
-};
-
-#include <eikappui.h>
-class CScummVMUi;
-class CScummWatcher : public CActive {
-public:
-	CScummWatcher();
-	~CScummWatcher();
-
-	void DoCancel();
-	void RunL();
-	CScummVMUi *iAppUi;
-};
-
-class CScummVMUi : public CEikAppUi {
-public:
-	CScummVMUi();
-	~CScummVMUi();
-
-	void ConstructL();
-	void HandleCommandL(TInt aCommand);
-	void HandleForegroundEventL(TBool aForeground);
-	void BringUpEmulatorL();
-
-private:
-	TThreadId iThreadId;
-	TInt iExeWgId;
-	RThread iThreadWatch;
-	CScummWatcher *iWatcher;
-};
-#endif
diff --git a/backends/epoc/build/ScummVmAif.rss b/backends/epoc/build/ScummVmAif.rss
deleted file mode 100644
index c58b006d12..0000000000
--- a/backends/epoc/build/ScummVmAif.rss
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-#include <aiftool.rh>
-
-
-RESOURCE AIF_DATA
-	{
-	app_uid= 0x101f9b57;
-	//
-	hidden=KAppNotHidden;
-	embeddability=KAppNotEmbeddable;
-	caption_list=
-		{ 
-		CAPTION { code=ELangEnglish;  caption="EScummVM"; },
-		CAPTION { code=ELangAmerican; caption="EScummVM"; },
-		CAPTION { code=ELangOther; caption="EScummVM"; }
-		};
-	//
-	num_icons=2;
-	}
-
-
-
diff --git a/backends/epoc/build/UIQ/BLD.INF b/backends/epoc/build/UIQ/BLD.INF
deleted file mode 100644
index 4e338ea818..0000000000
--- a/backends/epoc/build/UIQ/BLD.INF
+++ /dev/null
@@ -1,18 +0,0 @@
-PRJ_PLATFORMS
-WINS ARMI // ARM4 THUMB
-
-PRJ_MMPFILES
-//..\..\..\..\..\ESDL\Epoc\UIQ\ESDL_UIQ.mmp
-//..\..\..\..\..\zlib-1.2.2\epoc\zlib.mmp
-//..\..\..\..\..\tremor\epoc\tremor.mmp
-//..\..\..\..\..\libmad-0.15.1b\epoc\libmad.mmp
-..\scummvm_scumm.mmp
-..\scummvm_simon.mmp
-..\scummvm_sky.mmp
-..\scummvm_queen.mmp
-..\scummvm_gob.mmp
-..\scummvm_saga.mmp
-..\scummvm_base.mmp
-.\EScummVM_UIQ.mmp
-
-prj_testmmpfiles
diff --git a/backends/epoc/build/UIQ/EScummVM.cer b/backends/epoc/build/UIQ/EScummVM.cer
deleted file mode 100644
index 8a366f1cab..0000000000
--- a/backends/epoc/build/UIQ/EScummVM.cer
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEfDCCBDqgAwIBAgIBADALBgcqhkjOOAQDBQAwYTEQMA4GA1UEChMHU2N1bW1W
-TTEQMA4GA1UECxMHRGV2VGVhbTEQMA4GA1UEAxMHU2N1bW1WTTEpMCcGCSqGSIb3
-DQEJARYac3VtdGhpbndpY2tlZEB1c2Vycy5zZi5uZXQwHhcNMDUwNDI1MDIxNTA1
-WhcNMDYwNDI1MDIxNTA1WjBhMRAwDgYDVQQKEwdTY3VtbVZNMRAwDgYDVQQLEwdE
-ZXZUZWFtMRAwDgYDVQQDEwdTY3VtbVZNMSkwJwYJKoZIhvcNAQkBFhpzdW10aGlu
-d2lja2VkQHVzZXJzLnNmLm5ldDCCAzswggIuBgcqhkjOOAQBMIICIQKCAQEA84zz
-w3SAZSHUvmpEKn/o+RBhgs+Spxr1vIX4K7nc27dTl8Q8OWw+2kWUsySkzbhcwzV4
-r2exWSUjKeAMhVnnV5bhlTlHQITTEhIm5XkbWWgBnqjxa990YAfU2vSFV//Yq9IP
-eBtsx0Rc3M1QYAuBSZUA9n0J6omc2XrYqHNiqjlkgr0oVX1Y9acFNg2A4hoI0ltK
-0ARqlv+s/yAntg+p2c3abiIFceFpnF0pI/veoyXFASqebUNvquYryiUdSxYxamMF
-PB7i35VRY0WuOcDQsg6gMdAePC+oENBeEGAOaBrJ+M5KFRohcU8H4RF+FqaegtsA
-dHECDoQMfQNynaAMrwIVAL8RRcz9e50iVWpUWeLf19EdQ2crAoIBAQDZZ6z5JfNz
-f/ItU8/0Lo6lmFlC0axYhM5+MKBLGBE/Xo+tqUiwIhVBWGEZN0B8DGD7OnljPqWd
-2LzapsfGfoMh22oQTXljwS13So1akeJK0OaKZS699Nl5YrM0oFa6pLj9wbwPgd0I
-HwaVS4YZhrJyPAKiHZlz7YGIqEvCFjDWBsPMZ1gbTIGrvkhFNvClP7U5gBVj6ASQ
-gLwnuD7oApXfEbyEzPg0EmxD1zHsnvmwtQT66tmnVsgIe9gsF3XL2rlJIxogbM4/
-zKPzWiQaypdqzgdGT/F8fonumN8QA1GR+SHLh6LnxWVGQwXOueXdlZPH8ELg4mYv
-SgRTU+UYDc6YA4IBBQACggEAQ69uT4wfbkrXWu1uozU8yWNTpO1pq/eQdnz70dBr
-iO5wWD0ojEj6IOp968p5DbWCRn/xAl+aNAFlxaMvJrhjcKCPjYENQkPdRhrgB/tO
-B/LzK64RjPswAkOkwLX7GK6N3m0Yt2BW02t8j13f1Ckg1dvX7JKAD2xqAKIap94P
-CbF/URAYGKFNechB3MlJK9/zW9huk9PQ/ulsDrZ0itZuTR+24P7co8hAhGnVL6TC
-zQzL6WHF3MPirr5T0tvquryZKiX3shOJtsRRCjkJS4oEuFAwQx+q7HtCA/6+MmQF
-0odo9lzNa44SVBGkD9M8tRYrO4OaLuU24f4AeUx7VSflnDALBgcqhkjOOAQDBQAD
-LwAwLAIUUS6s1EFzzhP0ZyJ1GE0asFJtkVoCFBbw9qDXTT3mTyCVvmSwCB9YtCuz
------END CERTIFICATE-----
diff --git a/backends/epoc/build/UIQ/EScummVM.key b/backends/epoc/build/UIQ/EScummVM.key
deleted file mode 100644
index 9002105043..0000000000
--- a/backends/epoc/build/UIQ/EScummVM.key
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIDPgIBAAKCAQEA84zzw3SAZSHUvmpEKn/o+RBhgs+Spxr1vIX4K7nc27dTl8Q8
-OWw+2kWUsySkzbhcwzV4r2exWSUjKeAMhVnnV5bhlTlHQITTEhIm5XkbWWgBnqjx
-a990YAfU2vSFV//Yq9IPeBtsx0Rc3M1QYAuBSZUA9n0J6omc2XrYqHNiqjlkgr0o
-VX1Y9acFNg2A4hoI0ltK0ARqlv+s/yAntg+p2c3abiIFceFpnF0pI/veoyXFASqe
-bUNvquYryiUdSxYxamMFPB7i35VRY0WuOcDQsg6gMdAePC+oENBeEGAOaBrJ+M5K
-FRohcU8H4RF+FqaegtsAdHECDoQMfQNynaAMrwIVAL8RRcz9e50iVWpUWeLf19Ed
-Q2crAoIBAQDZZ6z5JfNzf/ItU8/0Lo6lmFlC0axYhM5+MKBLGBE/Xo+tqUiwIhVB
-WGEZN0B8DGD7OnljPqWd2LzapsfGfoMh22oQTXljwS13So1akeJK0OaKZS699Nl5
-YrM0oFa6pLj9wbwPgd0IHwaVS4YZhrJyPAKiHZlz7YGIqEvCFjDWBsPMZ1gbTIGr
-vkhFNvClP7U5gBVj6ASQgLwnuD7oApXfEbyEzPg0EmxD1zHsnvmwtQT66tmnVsgI
-e9gsF3XL2rlJIxogbM4/zKPzWiQaypdqzgdGT/F8fonumN8QA1GR+SHLh6LnxWVG
-QwXOueXdlZPH8ELg4mYvSgRTU+UYDc6YAoIBAEOvbk+MH25K11rtbqM1PMljU6Tt
-aav3kHZ8+9HQa4jucFg9KIxI+iDqfevKeQ21gkZ/8QJfmjQBZcWjLya4Y3Cgj42B
-DUJD3UYa4Af7Tgfy8yuuEYz7MAJDpMC1+xiujd5tGLdgVtNrfI9d39QpINXb1+yS
-gA9sagCiGqfeDwmxf1EQGBihTXnIQdzJSSvf81vYbpPT0P7pbA62dIrWbk0ftuD+
-3KPIQIRp1S+kws0My+lhxdzD4q6+U9Lb6rq8mSol97ITibbEUQo5CUuKBLhQMEMf
-qux7QgP+vjJkBdKHaPZczWuOElQRpA/TPLUWKzuDmi7lNuH+AHlMe1Un5ZwCFBoc
-P3MxHDcW4ZTIXdJxxCylT+ix
------END DSA PRIVATE KEY-----
diff --git a/backends/epoc/build/UIQ/EScummVM.rss b/backends/epoc/build/UIQ/EScummVM.rss
deleted file mode 100644
index 5255b87b32..0000000000
--- a/backends/epoc/build/UIQ/EScummVM.rss
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script 
-#include <eikon.rh>
-#include "..\..\Scummvm.hrh"
-// Include the standard Eikon resource ids 
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
-	{
-	}
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
-	{
-	}
-
diff --git a/backends/epoc/build/UIQ/EScummVM_080.pkg b/backends/epoc/build/UIQ/EScummVM_080.pkg
deleted file mode 100644
index 0e5484cf11..0000000000
--- a/backends/epoc/build/UIQ/EScummVM_080.pkg
+++ /dev/null
@@ -1,36 +0,0 @@
-;;;
-;;; EScummVM .PKG file for .SIS gegeration
-;;;
-
-; Languages
-;&EN
-
-; UID is the app's UID
-#{"EScummVM"},(0x101f9b57),0,80,3
-
-; Platform type
-(0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
-
-; Signature
-*"..\EScummVM.key","..\EScummVM.cer"
-
-; Application file
-"..\..\..\..\..\UIQ_21\epoc32\release\armi\urel\EScummVM.app"-"!:\system\apps\EScummVM\EScummVM.app"
-
-; AIF application information file
-;"..\..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.aif"-"!:\system\apps\EScummVM\EScummVM.aif"
-"EScummVM.aif"-"!:\system\apps\EScummVM\EScummVM.aif"
-
-; Resource file
-"..\..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.rsc"-"!:\system\apps\EScummVM\EScummVM.rsc"
-
-; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
-
-; Config/log files: 'empty' will automagically be removed on uninstall
-""-"c:\documents\EScummVM\scummvm.ini",FN
-""-"c:\documents\EScummVM\scummvm.stdout.txt",FN
-""-"c:\documents\EScummVM\scummvm.stderr.txt",FN
-
-; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
-; It will remove the config file, std***.txt files & dirs on uninstall.
diff --git a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
deleted file mode 100644
index d8309ea599..0000000000
--- a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header$
- */
-
-//
-// EPOC UIQ MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          ESCUMMVM.APP
-TARGETPATH      system\apps\EScummVM
-TARGETTYPE      app
-				
-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
-
-RESOURCE		EScummVM.rss
-EPOCSTACKSIZE	0x80008000 // this enables ECompXL app compression
-//AIF			EScummVm.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // mine still fails: I think it's because I have JRE 1.5 instead of 1.3 :P
-UID             0x100039ce 0x101f9b57
-
-MACRO			UIQ
-MACRO			EPOC_AS_APP
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-
-// automagically enabled static libs from macros above
-STATICLIBRARY	scummvm_scumm.lib
-STATICLIBRARY	scummvm_simon.lib
-STATICLIBRARY	scummvm_sky.lib
-STATICLIBRARY	scummvm_queen.lib
-STATICLIBRARY	scummvm_gob.lib
-STATICLIBRARY	scummvm_saga.lib
-STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
-STATICLIBRARY	libmad.lib
-STATICLIBRARY	zlib.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** Static Libraries
-
-STATICLIBRARY esdl.lib
-#if !defined(WINS)
-STATICLIBRARY egcc.lib // for __fixunsdfsi
-#endif
-
-// *** Include paths
-
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
-USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\epoc ..\..\..\..\backends\sdl ..\..\..\..\sound
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..\..\
-
-//START_AUTO_OBJECTS_BASE_// Updated @ Tue May 31 18:35:38 2005
-SOURCE base\engine.cpp
-SOURCE base\gameDetector.cpp
-SOURCE base\main.cpp
-SOURCE base\plugins.cpp
-//STOP_AUTO_OBJECTS_BASE_//
-
-// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\epoc\SymbianOS.cpp 
-SOURCE backends\epoc\SymbianActions.cpp 
-SOURCE backends\epoc\ScummApp.cpp
-
-SOURCE gui\Key.cpp
-SOURCE gui\KeysDialog.cpp
-SOURCE gui\Actions.cpp
-
-// *** Dynamic Libraries
-
-LIBRARY cone.lib  eikcore.lib 
-LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-LIBRARY qikctl.lib
diff --git a/backends/epoc/build/epoc-libmad.zip b/backends/epoc/build/epoc-libmad.zip
deleted file mode 100644
index dec1a8eb69..0000000000
--- a/backends/epoc/build/epoc-libmad.zip
+++ /dev/null
diff --git a/backends/epoc/build/epoc-tremor.zip b/backends/epoc/build/epoc-tremor.zip
deleted file mode 100644
index 2ad4fcfb43..0000000000
--- a/backends/epoc/build/epoc-tremor.zip
+++ /dev/null
diff --git a/backends/epoc/build/epoc-zlib.zip b/backends/epoc/build/epoc-zlib.zip
deleted file mode 100644
index efae82d6b3..0000000000
--- a/backends/epoc/build/epoc-zlib.zip
+++ /dev/null
diff --git a/backends/epoc/build/make.bat b/backends/epoc/build/make.bat
deleted file mode 100644
index a6ea619763..0000000000
--- a/backends/epoc/build/make.bat
+++ /dev/null
@@ -1,46 +0,0 @@
-@ECHO OFF
-
-SET target=%2
-
-if "%1"=="clean" goto clean
-if "%1"=="test" goto test
-if "%1"=="fast" goto fast
-if "%1"=="--help" goto help
-if "%1"=="-h" goto help
-
-SET platform=armi
-if "%1"=="" goto build
-SET platform=%1
-
-:build
-echo ---------------------------------------------------
-@ECHO ON
-call abld build %platform% urel %target%
-goto End
-
-:fast
-echo ---------------------------------------------------
-REM @ECHO ON
-call abld library  %platform% urel %target%
-REM call abld resource %platform% urel %target%
-call abld target   %platform% urel %target%
-goto End
-
-:test
-echo ---------------------------------------------------
-@ECHO ON
-call abld test build armi urel %target%
-goto End
-
-:clean
-abld clean %target%
-goto End
-
-:help
-echo Usage: make clean
-echo        make [armi|wins] [target] 
-goto End
-
-:End
-echo ---------------------------------------------------
-
diff --git a/backends/epoc/build/scummL.bmp b/backends/epoc/build/scummL.bmp
deleted file mode 100644
index 4cb8bd3228..0000000000
--- a/backends/epoc/build/scummL.bmp
+++ /dev/null
diff --git a/backends/epoc/build/scummLm.bmp b/backends/epoc/build/scummLm.bmp
deleted file mode 100644
index f4f35e48f2..0000000000
--- a/backends/epoc/build/scummLm.bmp
+++ /dev/null
diff --git a/backends/epoc/build/scummS.bmp b/backends/epoc/build/scummS.bmp
deleted file mode 100644
index 457ef4d241..0000000000
--- a/backends/epoc/build/scummS.bmp
+++ /dev/null
diff --git a/backends/epoc/build/scummSm.bmp b/backends/epoc/build/scummSm.bmp
deleted file mode 100644
index 9ddfee2a85..0000000000
--- a/backends/epoc/build/scummSm.bmp
+++ /dev/null
diff --git a/backends/epoc/build/scummvm_base.mmp b/backends/epoc/build/scummvm_base.mmp
deleted file mode 100644
index f2935ae927..0000000000
--- a/backends/epoc/build/scummvm_base.mmp
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_base.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
-
-// Note: the LIB:*.lib statements are used by updateMMPs.pl, so don't remove them!
-//START_AUTO_MACROS_MASTER//
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-//MACRO			USE_TREMOR			// LIB:libtremor.lib
-//MACRO			USE_VORBIS
-// these need too high a resolution
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-// these are not ready to be released
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-// these work, so don't disable them, left here because during dev you might wanna turn them off once in a while :)
-//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
-//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
-//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
-//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
-//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
-//MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
-//STOP_AUTO_MACROS_MASTER//
-
-// *** Include paths
-
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound
-USERINCLUDE		..\..\..\backends\fs ..\..\..\backends\epoc ..\..\..\backends\sdl
-
-SYSTEMINCLUDE 	\epoc32\include\ESDL
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-//SYSTEMINCLUDE   \epoc32\include\tremor -- don't need this: refs are direct: "tremor/includexx.h"
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\backends\epoc // for portdefs.h
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_COMMON_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE common\config-file.cpp
-SOURCE common\config-manager.cpp
-SOURCE common\file.cpp
-SOURCE common\md5.cpp
-SOURCE common\mutex.cpp
-SOURCE common\str.cpp
-SOURCE common\stream.cpp
-SOURCE common\timer.cpp
-SOURCE common\util.cpp
-SOURCE common\savefile.cpp
-SOURCE common\system.cpp
-SOURCE common\scaler.cpp
-SOURCE common\scaler\thumbnail.cpp
-//STOP_AUTO_OBJECTS_COMMON_//
-
-//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE graphics\animation.cpp
-SOURCE graphics\consolefont.cpp
-SOURCE graphics\font.cpp
-SOURCE graphics\fontman.cpp
-SOURCE graphics\ilbm.cpp
-SOURCE graphics\newfont.cpp
-SOURCE graphics\newfont_big.cpp
-SOURCE graphics\primitives.cpp
-SOURCE graphics\scummfont.cpp
-SOURCE graphics\surface.cpp
-//STOP_AUTO_OBJECTS_GRAPHICS_//
-
-// these next three will go into gui\modules.mk and will end up in START_AUTO_OBJECTS_GUI
-// for now they are in the phone platform specific MMP files because of library dependency probs
-//SOURCE gui\Key.cpp
-//SOURCE gui\KeysDialog.cpp
-//SOURCE gui\Actions.cpp
-
-//START_AUTO_OBJECTS_GUI_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE gui\about.cpp
-SOURCE gui\browser.cpp
-SOURCE gui\chooser.cpp
-SOURCE gui\console.cpp
-SOURCE gui\dialog.cpp
-SOURCE gui\editable.cpp
-SOURCE gui\EditTextWidget.cpp
-SOURCE gui\launcher.cpp
-SOURCE gui\ListWidget.cpp
-SOURCE gui\message.cpp
-SOURCE gui\newgui.cpp
-SOURCE gui\options.cpp
-SOURCE gui\PopUpWidget.cpp
-SOURCE gui\ScrollBarWidget.cpp
-SOURCE gui\TabWidget.cpp
-SOURCE gui\widget.cpp
-//STOP_AUTO_OBJECTS_GUI_//
-
-//START_AUTO_OBJECTS_SOUND_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE sound\adpcm.cpp
-SOURCE sound\audiocd.cpp
-SOURCE sound\audiostream.cpp
-SOURCE sound\flac.cpp
-SOURCE sound\fmopl.cpp
-SOURCE sound\mididrv.cpp
-SOURCE sound\midiparser.cpp
-SOURCE sound\midiparser_smf.cpp
-SOURCE sound\midiparser_xmidi.cpp
-SOURCE sound\mixer.cpp
-SOURCE sound\mp3.cpp
-SOURCE sound\mpu401.cpp
-SOURCE sound\rate.cpp
-SOURCE sound\voc.cpp
-SOURCE sound\vorbis.cpp
-SOURCE sound\wave.cpp
-SOURCE sound\softsynth\adlib.cpp
-SOURCE sound\softsynth\ym2612.cpp
-//STOP_AUTO_OBJECTS_SOUND_//
-
-// backend specific includes
-SOURCE backends\midi\null.cpp
-SOURCE backends\fs\fs.cpp
-// backend specific includes
diff --git a/backends/epoc/build/scummvm_gob.mmp b/backends/epoc/build/scummvm_gob.mmp
deleted file mode 100644
index c0defa3a88..0000000000
--- a/backends/epoc/build/scummvm_gob.mmp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_gob.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_GOB_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE gob\anim.cpp
-SOURCE gob\cdrom.cpp
-SOURCE gob\dataio.cpp
-SOURCE gob\draw.cpp
-SOURCE gob\driver_vga.cpp
-SOURCE gob\game.cpp
-SOURCE gob\global.cpp
-SOURCE gob\goblin.cpp
-SOURCE gob\init.cpp
-SOURCE gob\inter.cpp
-SOURCE gob\map.cpp
-SOURCE gob\mult.cpp
-SOURCE gob\pack.cpp
-SOURCE gob\palanim.cpp
-SOURCE gob\parse.cpp
-SOURCE gob\scenery.cpp
-SOURCE gob\util.cpp
-SOURCE gob\video.cpp
-SOURCE gob\sound.cpp
-SOURCE gob\timer.cpp
-SOURCE gob\gob.cpp
-//STOP_AUTO_OBJECTS_GOB_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\gob
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_kyra.mmp b/backends/epoc/build/scummvm_kyra.mmp
deleted file mode 100644
index 1b3a532f85..0000000000
--- a/backends/epoc/build/scummvm_kyra.mmp
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM Kyra
-//
-
-// *** Definitions
-
-TARGET          scummvm_kyra.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_KYRA_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE kyra\kyra.cpp
-SOURCE kyra\resource.cpp
-SOURCE kyra\screen.cpp
-SOURCE kyra\script_v1.cpp
-SOURCE kyra\script.cpp
-SOURCE kyra\sound.cpp
-SOURCE kyra\staticres.cpp
-SOURCE kyra\wsamovie.cpp
-//STOP_AUTO_OBJECTS_KYRA_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\kyra
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_queen.mmp b/backends/epoc/build/scummvm_queen.mmp
deleted file mode 100644
index 4548525e68..0000000000
--- a/backends/epoc/build/scummvm_queen.mmp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_queen.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_QUEEN_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE queen\bankman.cpp
-SOURCE queen\command.cpp
-SOURCE queen\credits.cpp
-SOURCE queen\cutaway.cpp
-SOURCE queen\debug.cpp
-SOURCE queen\display.cpp
-SOURCE queen\graphics.cpp
-SOURCE queen\grid.cpp
-SOURCE queen\input.cpp
-SOURCE queen\journal.cpp
-SOURCE queen\logic.cpp
-SOURCE queen\music.cpp
-SOURCE queen\musicdata.cpp
-SOURCE queen\queen.cpp
-SOURCE queen\resource.cpp
-SOURCE queen\restables.cpp
-SOURCE queen\sound.cpp
-SOURCE queen\state.cpp
-SOURCE queen\talk.cpp
-SOURCE queen\walk.cpp
-//STOP_AUTO_OBJECTS_QUEEN_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\queen
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_saga.mmp b/backends/epoc/build/scummvm_saga.mmp
deleted file mode 100644
index b06425612c..0000000000
--- a/backends/epoc/build/scummvm_saga.mmp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM Saga
-//
-
-// *** Definitions
-
-TARGET          scummvm_saga.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_SAGA_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE saga\actor.cpp
-SOURCE saga\animation.cpp
-SOURCE saga\console.cpp
-SOURCE saga\events.cpp
-SOURCE saga\font.cpp
-SOURCE saga\font_map.cpp
-SOURCE saga\game.cpp
-SOURCE saga\gfx.cpp
-SOURCE saga\ihnm_introproc.cpp
-SOURCE saga\image.cpp
-SOURCE saga\interface.cpp
-SOURCE saga\isomap.cpp
-SOURCE saga\ite_introproc.cpp
-SOURCE saga\itedata.cpp
-SOURCE saga\objectmap.cpp
-SOURCE saga\puzzle.cpp
-SOURCE saga\palanim.cpp
-SOURCE saga\render.cpp
-SOURCE saga\rscfile.cpp
-SOURCE saga\saga.cpp
-SOURCE saga\saveload.cpp
-SOURCE saga\scene.cpp
-SOURCE saga\script.cpp
-SOURCE saga\sfuncs.cpp
-SOURCE saga\sndres.cpp
-SOURCE saga\sprite.cpp
-SOURCE saga\sthread.cpp
-SOURCE saga\input.cpp
-SOURCE saga\music.cpp
-SOURCE saga\sound.cpp
-//STOP_AUTO_OBJECTS_SAGA_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\saga
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_scumm.mmp b/backends/epoc/build/scummvm_scumm.mmp
deleted file mode 100644
index 0a63328150..0000000000
--- a/backends/epoc/build/scummvm_scumm.mmp
+++ /dev/null
@@ -1,146 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_scumm.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_SCUMM_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE scumm\actor.cpp
-SOURCE scumm\akos.cpp
-SOURCE scumm\base-costume.cpp
-SOURCE scumm\bomp.cpp
-SOURCE scumm\boxes.cpp
-SOURCE scumm\camera.cpp
-SOURCE scumm\charset.cpp
-SOURCE scumm\costume.cpp
-SOURCE scumm\cursor.cpp
-SOURCE scumm\debugger.cpp
-SOURCE scumm\dialogs.cpp
-SOURCE scumm\gfx.cpp
-SOURCE scumm\imuse.cpp
-SOURCE scumm\imuse_player.cpp
-SOURCE scumm\input.cpp
-SOURCE scumm\instrument.cpp
-SOURCE scumm\help.cpp
-SOURCE scumm\midiparser_ro.cpp
-SOURCE scumm\midiparser_eup.cpp
-SOURCE scumm\object.cpp
-SOURCE scumm\palette.cpp
-SOURCE scumm\player_mod.cpp
-SOURCE scumm\player_v1.cpp
-SOURCE scumm\player_nes.cpp
-SOURCE scumm\player_v2.cpp
-SOURCE scumm\player_v2a.cpp
-SOURCE scumm\player_v3a.cpp
-SOURCE scumm\resource.cpp
-SOURCE scumm\resource_v2.cpp
-SOURCE scumm\resource_v3.cpp
-SOURCE scumm\resource_v4.cpp
-SOURCE scumm\room.cpp
-SOURCE scumm\saveload.cpp
-SOURCE scumm\script.cpp
-SOURCE scumm\script_c64.cpp
-SOURCE scumm\script_v2.cpp
-SOURCE scumm\script_v5.cpp
-SOURCE scumm\script_v6.cpp
-SOURCE scumm\script_v6he.cpp
-SOURCE scumm\scumm.cpp
-SOURCE scumm\sound.cpp
-SOURCE scumm\string.cpp
-SOURCE scumm\usage_bits.cpp
-SOURCE scumm\util.cpp
-SOURCE scumm\vars.cpp
-SOURCE scumm\verbs.cpp
-SOURCE scumm\thumbnail.cpp
-//STOP_AUTO_OBJECTS_SCUMM_//
-
-//START_AUTO_OBJECTS_SCUMM_DISABLE_SCUMM_7_8// Updated @ Mon Jun  6 23:03:34 2005
-SOURCE scumm\script_v8.cpp
-SOURCE scumm\nut_renderer.cpp
-SOURCE scumm\imuse_digi\dimuse.cpp
-SOURCE scumm\imuse_digi\dimuse_bndmgr.cpp
-SOURCE scumm\imuse_digi\dimuse_codecs.cpp
-SOURCE scumm\imuse_digi\dimuse_music.cpp
-SOURCE scumm\imuse_digi\dimuse_sndmgr.cpp
-SOURCE scumm\imuse_digi\dimuse_script.cpp
-SOURCE scumm\imuse_digi\dimuse_track.cpp
-SOURCE scumm\imuse_digi\dimuse_tables.cpp
-SOURCE scumm\insane\insane.cpp
-SOURCE scumm\insane\insane_ben.cpp
-SOURCE scumm\insane\insane_enemy.cpp
-SOURCE scumm\insane\insane_scenes.cpp
-SOURCE scumm\insane\insane_iact.cpp
-SOURCE scumm\smush\chunk.cpp
-SOURCE scumm\smush\codec1.cpp
-SOURCE scumm\smush\codec37.cpp
-SOURCE scumm\smush\codec47.cpp
-SOURCE scumm\smush\imuse_channel.cpp
-SOURCE scumm\smush\smush_player.cpp
-SOURCE scumm\smush\saud_channel.cpp
-SOURCE scumm\smush\smush_mixer.cpp
-SOURCE scumm\smush\smush_font.cpp
-//STOP_AUTO_OBJECTS_SCUMM_DISABLE_SCUMM_7_8//
-
-//START_AUTO_OBJECTS_SCUMM_DISABLE_HE// Updated @ Mon Jun  6 23:03:34 2005
-SOURCE scumm\logic_he.cpp
-SOURCE scumm\palette_he.cpp
-SOURCE scumm\resource_v7he.cpp
-SOURCE scumm\script_v7he.cpp
-SOURCE scumm\script_v72he.cpp
-SOURCE scumm\script_v80he.cpp
-SOURCE scumm\script_v90he.cpp
-SOURCE scumm\script_v100he.cpp
-SOURCE scumm\sprite_he.cpp
-SOURCE scumm\wiz_he.cpp
-//STOP_AUTO_OBJECTS_SCUMM_DISABLE_HE//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\scumm ..\..\..\scumm\smush ..\..\..\scumm\insane
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-
-SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc 
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\..\..\backends\epoc // for portdefs.h
diff --git a/backends/epoc/build/scummvm_simon.mmp b/backends/epoc/build/scummvm_simon.mmp
deleted file mode 100644
index ebf0bf0a7f..0000000000
--- a/backends/epoc/build/scummvm_simon.mmp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_simon.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_SIMON_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE simon\charset.cpp
-SOURCE simon\cursor.cpp
-SOURCE simon\debug.cpp
-SOURCE simon\debugger.cpp
-SOURCE simon\icons.cpp
-SOURCE simon\items.cpp
-SOURCE simon\midi.cpp
-SOURCE simon\midiparser_s1d.cpp
-SOURCE simon\res.cpp
-SOURCE simon\saveload.cpp
-SOURCE simon\sound.cpp
-SOURCE simon\simon.cpp
-SOURCE simon\verb.cpp
-SOURCE simon\vga.cpp
-//STOP_AUTO_OBJECTS_SIMON_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\simon
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_sky.mmp b/backends/epoc/build/scummvm_sky.mmp
deleted file mode 100644
index 77af38a342..0000000000
--- a/backends/epoc/build/scummvm_sky.mmp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * 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 The ScummVM project
- *
- * 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.
- *
- * $Header: 
- */
-
-//
-// EPOC MMP makefile project for ScummVM
-//
-
-// *** Definitions
-
-TARGET          scummvm_sky.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
-
-//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
-MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD				// LIB:libmad.lib
-MACRO			USE_ZLIB			// LIB:zlib.lib
-MACRO			DISABLE_SWORD1
-MACRO			DISABLE_SWORD2
-MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
-//STOP_AUTO_MACROS_SLAVE//
-
-// *** SOURCE files
-
-SOURCEPATH ..\..\..
-
-//START_AUTO_OBJECTS_SKY_// Updated @ Fri Sep 30 14:01:53 2005
-SOURCE sky\autoroute.cpp
-SOURCE sky\compact.cpp
-SOURCE sky\control.cpp
-SOURCE sky\debug.cpp
-SOURCE sky\disk.cpp
-SOURCE sky\grid.cpp
-SOURCE sky\hufftext.cpp
-SOURCE sky\intro.cpp
-SOURCE sky\logic.cpp
-SOURCE sky\mouse.cpp
-SOURCE sky\rnc_deco.cpp
-SOURCE sky\screen.cpp
-SOURCE sky\sky.cpp
-SOURCE sky\sound.cpp
-SOURCE sky\text.cpp
-SOURCE sky\music\adlibchannel.cpp
-SOURCE sky\music\adlibmusic.cpp
-SOURCE sky\music\gmchannel.cpp
-SOURCE sky\music\gmmusic.cpp
-SOURCE sky\music\mt32music.cpp
-SOURCE sky\music\musicbase.cpp
-//STOP_AUTO_OBJECTS_SKY_//
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\sky ..\..\..\sky\music
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
-SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/updateMMPs.pl b/backends/epoc/build/updateMMPs.pl
deleted file mode 100644
index 1b3ea77fb0..0000000000
--- a/backends/epoc/build/updateMMPs.pl
+++ /dev/null
@@ -1,256 +0,0 @@
-
-use Cwd;
-
-print "
-=======================================================================================
-Preparing to update all the Symbian MMP project files with objects from module.mk files
-=======================================================================================
-
-";
-	
-$buildDir = getcwd();
-chdir("../../../");
-
-my @std = (""); # section standard, no #ifdef
-my @exc = ("mt32","fluidsynth"); # exclusions for sound
-
-#arseModule(mmpStr,		dirStr,		ifdefArray,		[exclusionsArray])
-#ParseModule("_base",	"base",		\@std); # now in ./TRG/EScummVM_TRG.mmp, these never change anyways...
-ParseModule("_base",	"common",	\@std);
-ParseModule("_base",	"gui",		\@std);
-ParseModule("_base",	"graphics",	\@std);
-ParseModule("_base",	"sound",	\@std,		\@exc);
-
-ParseModule("_scumm",	"scumm",	\@std);
-ParseModule("_queen",	"queen",	\@std);
-ParseModule("_simon",	"simon",	\@std);
-ParseModule("_sky",		"sky",		\@std);
-ParseModule("_gob",		"gob",		\@std);
-ParseModule("_saga",	"saga",		\@std);
-ParseModule("_kyra",	"kyra",		\@std);
-
-print "
-=======================================================================================
-Updating slave MACRO settings in MMP files from master 'scummvm_base.mmp'
-=======================================================================================
-
-";
-
-@mmp_files = (	"scummvm_scumm.mmp", "scummvm_queen.mmp", "scummvm_simon.mmp", "scummvm_sky.mmp", "scummvm_gob.mmp", "scummvm_saga.mmp", "scummvm_kyra.mmp", 
-				"UIQ/EScummVM_UIQ.mmp", "S60/EScummVM_S60_EXE.mmp", "S80/EScummVM_S80.mmp", "S90/EScummVM_S90.mmp");
-
-UpdateSlaveMacros();
-
-print "
-=======================================================================================
-Done. Enjoy :P
-=======================================================================================
-";
-
-##################################################################################################################
-##################################################################################################################
-
-# parses multiple sections per mmp/module 
-sub ParseModule
-{
-	my ($mmp,$module,$sections,$exclusions) = @_;
-	my @sections = @{$sections};
-	my @exclusions = @{$exclusions};
-
-	foreach $section (@sections)
-	{
-		CheckForModuleMK($module, $section, @exclusions);
-		UpdateProjectFile($mmp, $module, $section);
-	}
-}
-
-##################################################################################################################
-
-# parses all module.mk files in a dir and its subdirs
-sub CheckForModuleMK
-{
-	my ($item,$section,@exclusions) = @_;
-
-	if (-d $item)
-	{
-		#print "$item\n";
-		
-		opendir DIR, $item;
-		#my @Files = readdir DIR;
-		my @Files = grep s/^([^\.].*)$/$1/, readdir DIR;
-		closedir DIR;
-
-		foreach $entry (@Files)
-		{
-			CheckForModuleMK("$item/$entry", $section, @exclusions);
-		}
-	}
-
-	if (-f $item and $item =~ /.*\/module.mk$/)
-	{
-		my $sec = "";
-		my $secnum = 0;
-		
-		print "Parsing  $item for section '$section' ... ";
-
-		open FILE, $item;
-		my @lines = <FILE>;
-		close FILE;
-
-		my $count = @lines;
-		print "$count lines";
-		
-		A: foreach $line (@lines)
-		{
-			# found a section? reset 
-			if ($line =~ /^ifndef (.*)/)
-			{
-				$sec = $1;
-			}
-			
-			# found an object? Not uncommented!
-			if (!($line =~ /^#/) && $line =~ s/\.o/.cpp/)
-			{
-				# handle this section?
-				if ($sec eq $section)
-				{
-					$line =~ s/^\s*//g; # remove possible leading whitespace
-					$line =~ s/ \\//; # remove possible trailing ' \'
-					$line =~ s/\//\\/g; # replace / with \
-					chop($line); # remove \n
-					
-					# do we need to skip this file?
-					foreach $exclusion (@exclusions)
-					{
-						if ($line =~ /$exclusion/)
-						{
-							#print "\n         !$line (excluded)";
-							next A;
-						}
-					}
-					
-					$secnum++;
-					#print "\n         $line";
-					$output .= "SOURCE $line\n";
-				}
-			}
-		}
-		print " -- $secnum objects selected\n";
-	}
-}
-
-##################################################################################################################
-
-# update an MMP project file with the new objects
-sub UpdateProjectFile
-{
-	my ($mmp,$module,$section) = @_;
-	my $n = "AUTO_OBJECTS_".uc($module)."_$section";
-	my $a = "\/\/START_$n\/\/";
-	my $b = "\/\/STOP_$n\/\/";
-	my $name = "scummvm$mmp.mmp";	
-	my $file = "$buildDir/$name";
-	my $updated = " Updated @ ".localtime();
-
-	print "     ===>Updating backends/epoc/build/$name @ $n ... ";
-
-	open FILE, "$file";
-	my @lines = <FILE>;
-	close FILE;
-	
-	my $onestr = join("",@lines);
-	$onestr =~ s/$a.*$b/$a$updated\n$output$b/s;
-	
-	open FILE, ">$file";
-	print FILE $onestr;
-	close FILE;
-	
-	print "done.\n";
-	
-	$output = "";
-}
-
-##################################################################################################################
-
-sub UpdateSlaveMacros
-{
-	my $updated = " Updated @ ".localtime();
-
-	my $name = "scummvm_base.mmp";	
-	my $file = "$buildDir/$name";
-	print "Reading master MACROS from backends/epoc/build/$name ... ";
-
-	open FILE, "$file";
-	my @lines = <FILE>;
-	close FILE;
-	my $onestr = join("",@lines);
-
-	my $n = "AUTO_MACROS_MASTER";
-	my $a = "\/\/START_$n\/\/";
-	my $b = "\/\/STOP_$n\/\/";
-	$onestr =~ /$a(.*)$b/s;
-	my $macros = $1;
-	
-	my $libs = "\n// automagically enabled static libs from macros above\n";
-	my $libZ = "STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs\n";
-	my $macro_counter = 0;
-	my $macros2 = "\n"; # output
-
-	foreach $line (split("\n", $macros))
-	{
-		# do we need to add a static .lib?
-		if ($line =~ /^.*MACRO\s*([A-Z_]*)\s*\/\/\s*LIB\:(.*)$/)
-		{
-			my $macro = $1; my $lib = $2;
-			
-			# this macro enabled? then also add the .lib
-			if ($line =~ /^\s*MACRO\s*$macro/m)
-			{
-				$libZ .= "STATICLIBRARY	$lib\n" if ($macro =~ /^USE_/);
-			}
-			else
-			{
-				$libs .= "STATICLIBRARY	$lib\n" if ($macro =~ /^DISABLE_/);
-			}
-			$macro_counter++;
-		}
-		# no comment? add the macro
-		if ($line =~ /^\s*MACRO/)
-		{
-			$macros2 .= "$line\n";
-		}
-	}		
-
-	print "$macro_counter macro lines.\n";
-
-	$n = "AUTO_MACROS_SLAVE";
-	$a = "\/\/START_$n\/\/";
-	$b = "\/\/STOP_$n\/\/";
-	
-	foreach $name (@mmp_files)
-	{
-		$file = "$buildDir/$name";
-		print "Updating macros in backends/epoc/build/$name ... ";
-	
-		open FILE, "$file";
-		@lines = <FILE>;
-		close FILE;
-		
-		$onestr = join("",@lines);
-	
-		# slash in name means it's a phone specific build file: add LIBs
-		my $libs2 = ""; # output
-		$libs2 .= "$libs$libZ" if ($name =~ /\//);
-
-		$onestr =~ s/$a.*$b/$a$updated$macros2$libs2$b/s;
-		
-		open FILE, ">$file";
-		print FILE $onestr;
-		close FILE;
-
-		my $count = @lines;
-		print "wrote $count lines.\n";
-	}
-}		
-
-##################################################################################################################