diff options
| author | Lars Persson | 2006-02-12 00:27:19 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-02-12 00:27:19 +0000 |
| commit | 37f433a7ad516df85cd62e32e1a178635212b047 (patch) | |
| tree | 9128c436cc09d6bb2ab1031ee0aeb0c0a28dab5b /backends/epoc/src/SymbianOS.cpp | |
| parent | 80cf2fa46ff638ae25fe85a3a89997ceb7f09aae (diff) | |
| download | scummvm-rg350-37f433a7ad516df85cd62e32e1a178635212b047.tar.gz scummvm-rg350-37f433a7ad516df85cd62e32e1a178635212b047.tar.bz2 scummvm-rg350-37f433a7ad516df85cd62e32e1a178635212b047.zip | |
* New and tested builds for S60V3 and UIQ3
* New upscaled icons for UIQ3/S60V3. SVG/Scalable version needed for S60V3 for proper good looks
* Critical bug in Symbian-fs fixed (exception for UIQ3/S60V3)
*Removed duplicate files for easier maintanence
*New handling for Symbian error messages, save paths etc
*All naming now is ScummVM for all apps and targets
svn-id: r20585
Diffstat (limited to 'backends/epoc/src/SymbianOS.cpp')
| -rw-r--r-- | backends/epoc/src/SymbianOS.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/backends/epoc/src/SymbianOS.cpp b/backends/epoc/src/SymbianOS.cpp index 07199c5cfa..dc8a79fe47 100644 --- a/backends/epoc/src/SymbianOS.cpp +++ b/backends/epoc/src/SymbianOS.cpp @@ -24,27 +24,26 @@ #include "backends/epoc/src/SymbianOS.h" #include "backends/epoc/src/SymbianActions.h" +#include "common/config-manager.h" #include "gui/Actions.h" #include "gui/Key.h" #include "gui/message.h" -#include <eikenv.h> // for CEikonEnv::Static() @ SymbianFatalError() +#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError() +#include "ESDL/sdlapp.h" // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath() -#include "common/config-manager.h" +////////// extern "C" /////////////////////////////////////////////////// extern Common::ConfigManager *g_config; -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {"1x", "Fullscreen", GFX_NORMAL}, - {0, 0, 0} -}; - OSystem *OSystem_SymbianOS_create() { return new OSystem_SDL_Symbian(); } +namespace Symbian { + // Show a simple Symbian Info win with Msg & exit -void SymbianFatalError(const char *msg) { +void FatalError(const char *msg) { TPtrC8 msgPtr((const TUint8 *)msg); TBuf<512> msg16Bit; msg16Bit.Copy(msgPtr); @@ -54,6 +53,21 @@ void SymbianFatalError(const char *msg) { g_system->quit(); } +// make this easily available everywhere +char* GetExecutablePath() +{ + return CSDLApp::GetExecutablePathCStr(); +} + +} // namespace Symbian { + +////////// OSystem_SDL_Symbian ////////////////////////////////////////// + +static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { + {"1x", "Fullscreen", GFX_NORMAL}, + {0, 0, 0} +}; + bool OSystem_SDL_Symbian::hasFeature(Feature f) { switch(f) { case kFeatureFullscreenMode: |