aboutsummaryrefslogtreecommitdiff
path: root/backends/epoc/build
diff options
context:
space:
mode:
Diffstat (limited to 'backends/epoc/build')
-rw-r--r--backends/epoc/build/S60/BLD.INF1
-rw-r--r--backends/epoc/build/S60/EScummVM_S60.mmp24
-rw-r--r--backends/epoc/build/S60/EScummVM_S60_EXE.mmp95
-rw-r--r--backends/epoc/build/S60/ScummVMApp.cpp1
-rw-r--r--backends/epoc/build/S80/EScummVM_S80.mmp4
-rw-r--r--backends/epoc/build/S90/EScummvm_S90.mmp4
-rw-r--r--backends/epoc/build/UIQ/EScummVM.rss19
-rw-r--r--backends/epoc/build/UIQ/EScummVM_UIQ.mmp10
-rw-r--r--backends/epoc/build/scummvm_base.mmp1
9 files changed, 128 insertions, 31 deletions
diff --git a/backends/epoc/build/S60/BLD.INF b/backends/epoc/build/S60/BLD.INF
index 25d2d236ca..b65f65c7e2 100644
--- a/backends/epoc/build/S60/BLD.INF
+++ b/backends/epoc/build/S60/BLD.INF
@@ -10,3 +10,4 @@ PRJ_MMPFILES
..\scummvm_gob.mmp
.\EScummVM_S60.mmp
.\EScummVM_S60_App.mmp
+.\EScummVM_S60_Exe.mmp
diff --git a/backends/epoc/build/S60/EScummVM_S60.mmp b/backends/epoc/build/S60/EScummVM_S60.mmp
index 9fe8e1e9c7..143306a72c 100644
--- a/backends/epoc/build/S60/EScummVM_S60.mmp
+++ b/backends/epoc/build/S60/EScummVM_S60.mmp
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header:
+ * $Header$
*/
//
@@ -27,22 +27,22 @@
// *** Definitions
-#if defined(WINS)
- TARGET EScummVM.dll
-#else
- TARGET EScummVM.exe
-#endif
-TARGETPATH system\apps\EScummVMs60
-TARGETTYPE EXEDLL
+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
-sourcepath ..\
-EPOCSTACKSIZE 0x00008000
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
@@ -100,8 +100,12 @@ 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
diff --git a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
new file mode 100644
index 0000000000..ebb58553bb
--- /dev/null
+++ b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
@@ -0,0 +1,95 @@
+//
+// 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
+ // /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
+sourcepath ..\
+
+EPOCSTACKSIZE 0x00008000
+
+EPOCHEAPSIZE 1024 5242880
+
+MACRO S60
+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_base.lib
+
+STATICLIBRARY libmad.lib
+STATICLIBRARY zlib.lib
+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
index 1702a88ba7..93a28694c3 100644
--- a/backends/epoc/build/S60/ScummVMApp.cpp
+++ b/backends/epoc/build/S60/ScummVMApp.cpp
@@ -95,6 +95,7 @@ void CScummVMUi::ConstructL() {
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));
diff --git a/backends/epoc/build/S80/EScummVM_S80.mmp b/backends/epoc/build/S80/EScummVM_S80.mmp
index 4b12e269b7..3e843ab2cf 100644
--- a/backends/epoc/build/S80/EScummVM_S80.mmp
+++ b/backends/epoc/build/S80/EScummVM_S80.mmp
@@ -100,8 +100,12 @@ 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
diff --git a/backends/epoc/build/S90/EScummvm_S90.mmp b/backends/epoc/build/S90/EScummvm_S90.mmp
index 6327b93c74..79d729b2a1 100644
--- a/backends/epoc/build/S90/EScummvm_S90.mmp
+++ b/backends/epoc/build/S90/EScummvm_S90.mmp
@@ -100,8 +100,12 @@ 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
diff --git a/backends/epoc/build/UIQ/EScummVM.rss b/backends/epoc/build/UIQ/EScummVM.rss
index 470e819220..72f798781d 100644
--- a/backends/epoc/build/UIQ/EScummVM.rss
+++ b/backends/epoc/build/UIQ/EScummVM.rss
@@ -28,7 +28,7 @@ NAME SCUM
// Include definitions of resource STRUCTS used by this
// resource script
#include <eikon.rh>
-#include "..\backends\epoc\Scummvm.hrh"
+#include "..\..\Scummvm.hrh"
// Include the standard Eikon resource ids
#include <eikon.rsg>
@@ -41,22 +41,5 @@ 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/UIQ/EScummVM_UIQ.mmp b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
index c0ad2e1bef..fd4acda861 100644
--- a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
+++ b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header:
+ * $Header$
*/
//
@@ -36,11 +36,12 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
RESOURCE EScummVM.rss
EPOCSTACKSIZE 0x80008000 // this enables ECompXL app compression
-AIF EScummVm.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // still fails?
+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 NONSTANDARD_PORT
+MACRO EPOC_AS_APP
// these need too high a resolution
MACRO DISABLE_SWORD1
@@ -98,8 +99,13 @@ 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
diff --git a/backends/epoc/build/scummvm_base.mmp b/backends/epoc/build/scummvm_base.mmp
index e7c0a5f3de..9fb213935f 100644
--- a/backends/epoc/build/scummvm_base.mmp
+++ b/backends/epoc/build/scummvm_base.mmp
@@ -21,7 +21,6 @@
* $Header:
*/
-
//
// EPOC MMP makefile project for ScummVM
//