diff options
| -rw-r--r-- | backends/symbian/AdaptAllMMPs.pl | 1 | ||||
| -rw-r--r-- | backends/symbian/UIQ3/scummvm_loc.rss | 22 | ||||
| -rw-r--r-- | backends/symbian/UIQ3/scummvm_reg.rss | 18 | ||||
| -rw-r--r-- | backends/symbian/mmp/initial_mmps.zip | bin | 28765 -> 30154 bytes | |||
| -rw-r--r-- | backends/symbian/src/ScummApp.cpp | 4 | ||||
| -rw-r--r-- | backends/symbian/src/SymbianActions.cpp | 2 | ||||
| -rw-r--r-- | backends/symbian/src/SymbianOS.cpp | 4 | ||||
| -rw-r--r-- | base/main.cpp | 2 | ||||
| -rw-r--r-- | gui/Actions.cpp | 2 |
9 files changed, 48 insertions, 7 deletions
diff --git a/backends/symbian/AdaptAllMMPs.pl b/backends/symbian/AdaptAllMMPs.pl index 357c1bbc1b..8aae5b2f5a 100644 --- a/backends/symbian/AdaptAllMMPs.pl +++ b/backends/symbian/AdaptAllMMPs.pl @@ -45,6 +45,7 @@ ParseModule("_saga", "saga", \@section_empty); ParseModule("_kyra", "kyra", \@section_empty); ParseModule("_sword1", "sword1", \@section_empty); ParseModule("_sword2", "sword2", \@section_empty); +ParseModule("_lure", "lure", \@section_empty); print " ======================================================================================= diff --git a/backends/symbian/UIQ3/scummvm_loc.rss b/backends/symbian/UIQ3/scummvm_loc.rss new file mode 100644 index 0000000000..83a8cfcc4c --- /dev/null +++ b/backends/symbian/UIQ3/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/symbian/UIQ3/scummvm_reg.rss b/backends/symbian/UIQ3/scummvm_reg.rss new file mode 100644 index 0000000000..df99094b2e --- /dev/null +++ b/backends/symbian/UIQ3/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"; + } + diff --git a/backends/symbian/mmp/initial_mmps.zip b/backends/symbian/mmp/initial_mmps.zip Binary files differindex 96f6ca5700..c6a5307b0a 100644 --- a/backends/symbian/mmp/initial_mmps.zip +++ b/backends/symbian/mmp/initial_mmps.zip diff --git a/backends/symbian/src/ScummApp.cpp b/backends/symbian/src/ScummApp.cpp index 09edfb3215..71cbb33887 100644 --- a/backends/symbian/src/ScummApp.cpp +++ b/backends/symbian/src/ScummApp.cpp @@ -22,9 +22,9 @@ * $Id$ */ -#include "backends/epoc/src/ScummApp.h" +#include "backends/symbian/src/ScummApp.h" +#include "backends/symbian/src/ScummVM.hrh" -#include "backends/epoc/src/ScummVM.hrh" #define _PAGESIZE_ 0x1000 #if defined (__WINS__) && !defined (__SERIES60_30__) diff --git a/backends/symbian/src/SymbianActions.cpp b/backends/symbian/src/SymbianActions.cpp index 1b8abc6661..ec93da2511 100644 --- a/backends/symbian/src/SymbianActions.cpp +++ b/backends/symbian/src/SymbianActions.cpp @@ -21,7 +21,7 @@ */ #include "common/stdafx.h" -#include "backends/epoc/src/SymbianActions.h" +#include "backends/symbian/src/SymbianActions.h" #include "gui/message.h" #include "scumm/scumm.h" diff --git a/backends/symbian/src/SymbianOS.cpp b/backends/symbian/src/SymbianOS.cpp index dc8a79fe47..720fb85820 100644 --- a/backends/symbian/src/SymbianOS.cpp +++ b/backends/symbian/src/SymbianOS.cpp @@ -22,8 +22,8 @@ * $Id$ */ -#include "backends/epoc/src/SymbianOS.h" -#include "backends/epoc/src/SymbianActions.h" +#include "backends/symbian/src/SymbianOS.h" +#include "backends/symbian/src/SymbianActions.h" #include "common/config-manager.h" #include "gui/Actions.h" #include "gui/Key.h" diff --git a/base/main.cpp b/base/main.cpp index ec24f0fc68..2a3ed81b0c 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -134,7 +134,7 @@ const char *gScummVMFeatures = "" #ifdef __SYMBIAN32__ // we want a list of compiled in engines visible in the program, // because we also release special builds with only one engine -#include "backends/epoc/src/main_features.inl" +#include "backends/symbian/src/main_features.inl" #endif ; diff --git a/gui/Actions.cpp b/gui/Actions.cpp index 50c921dcf6..8dd25f4942 100644 --- a/gui/Actions.cpp +++ b/gui/Actions.cpp @@ -30,7 +30,7 @@ #include "backends/wince/CEActionsPocket.h" #include "backends/wince/CEActionsSmartphone.h" #elif defined(__SYMBIAN32__) - #include "backends/epoc/src/SymbianActions.h" + #include "backends/symbian/src/SymbianActions.h" #endif namespace GUI { |