aboutsummaryrefslogtreecommitdiff
path: root/backends/epoc/S60v3
diff options
context:
space:
mode:
Diffstat (limited to 'backends/epoc/S60v3')
-rw-r--r--backends/epoc/S60v3/ScummVM.rss46
-rw-r--r--backends/epoc/S60v3/ScummVMApp.cpp165
-rw-r--r--backends/epoc/S60v3/ScummVMApp.h80
-rw-r--r--backends/epoc/S60v3/ScummVMS60.rss62
-rw-r--r--backends/epoc/S60v3/ScummVM_Loc.rss22
-rw-r--r--backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg11
-rw-r--r--backends/epoc/S60v3/scummvm_reg.rss18
7 files changed, 46 insertions, 358 deletions
diff --git a/backends/epoc/S60v3/ScummVM.rss b/backends/epoc/S60v3/ScummVM.rss
deleted file mode 100644
index 41aa0a59e2..0000000000
--- a/backends/epoc/S60v3/ScummVM.rss
+++ /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.
- *
- * $URL$
- * $Id$
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script
-#include <eikon.rh>
-#include "..\src\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/S60v3/ScummVMApp.cpp b/backends/epoc/S60v3/ScummVMApp.cpp
deleted file mode 100644
index 33e3614059..0000000000
--- a/backends/epoc/S60v3/ScummVMApp.cpp
+++ /dev/null
@@ -1,165 +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-2006 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.
- *
- * $URL$
- * $Id$
- */
-
-#include "ScummVMapp.h"
-#include <scummvms60.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();
- TApaTaskList taskList(iEikonEnv->WsSession());
- TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
- myTask.SendToBackground();
-
- 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
- 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/S60v3/ScummVMApp.h b/backends/epoc/S60v3/ScummVMApp.h
deleted file mode 100644
index 5ffeeee46a..0000000000
--- a/backends/epoc/S60v3/ScummVMApp.h
+++ /dev/null
@@ -1,80 +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-2006 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.
- *
- * $URL$
- * $Id$
- */
-
-#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();
- CEikAppUi* CreateAppUiL();
- void ConstructL();
- CScummVMDoc(CEikApplication& aApplicaiton);
-};
-
-#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/S60v3/ScummVMS60.rss b/backends/epoc/S60v3/ScummVMS60.rss
deleted file mode 100644
index 0b699ea305..0000000000
--- a/backends/epoc/S60v3/ScummVMS60.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 "..\src\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/S60v3/ScummVM_Loc.rss b/backends/epoc/S60v3/ScummVM_Loc.rss
new file mode 100644
index 0000000000..83a8cfcc4c
--- /dev/null
+++ b/backends/epoc/S60v3/ScummVM_Loc.rss
@@ -0,0 +1,22 @@
+#include <AppInfo.rh>
+
+// This file localise the applications icons and caption
+RESOURCE LOCALISABLE_APP_INFO
+ {
+ caption_and_icon =
+ {
+ CAPTION_AND_ICON_INFO
+ {
+ // The caption text is defined in the rls file
+ caption = "ScummVM";
+ // Icons are used to represent applications in the
+ // application launcher and application title bar.
+ // The number_of_icons value identifies how many icons
+ // that exist in the icon_file.
+ number_of_icons = 3;
+ // Using the application icons.
+ icon_file = "\\Resource\\Apps\\ScummVM.mbm";
+ }
+ };
+ }
+
diff --git a/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
index dc73df4b63..a2e1a56e1a 100644
--- a/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/epoc/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -6,16 +6,17 @@
;&EN
; UID is the app's UID
-#{"ScummVM S60v3"},(0x101f9b57),0,80,3
+#{"ScummVM S60v3"},(0xA0000657),0,82.0
; Platform type
(0x101F6F88), 0, 0, 0, {"Series60ProductID"}
; Launcher, Application, AIF & Resource file
-"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
-"\epoc32\release\armi\urel\ScummVM.exe"-"!:\system\apps\ScummVM\ScummVM.exe"
-"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif"
-"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc"
+"\s60v3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe"
+"\s60v3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc"
+"\s60v3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc"
+"\s60v3\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM"
+"\s60v3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
; Config/log files: 'empty' will automagically be removed on uninstall
""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
diff --git a/backends/epoc/S60v3/scummvm_reg.rss b/backends/epoc/S60v3/scummvm_reg.rss
new file mode 100644
index 0000000000..df99094b2e
--- /dev/null
+++ b/backends/epoc/S60v3/scummvm_reg.rss
@@ -0,0 +1,18 @@
+// All registration files need to #include appinfo.rh.
+#include <AppInfo.rh>
+
+// All registration files must define UID2, which is always
+// KUidAppRegistrationResourceFile, and UID3, which is the application's UID.
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0000657 // application UID
+
+// Registration file need to containo an APP_REGISTRATION_INFO resource that
+// minimally needs to provide the name of the application binary (using the
+// app_file statement).
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file = "ScummVM"; // filename of application binary (minus extension)
+ // Specify the location of the localisable icon/caption definition file
+ localisable_resource_file = "\\Resource\\Apps\\ScummVM_loc";
+ }
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 18:19:43 +0000