From 124459784987ece0088e829d3ce354997e9d6bb6 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 18 Jan 2015 02:24:25 +0000 Subject: JANITORIAL: Update copyright year --- backends/platform/symbian/src/ScummVm.hrh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/ScummVm.hrh b/backends/platform/symbian/src/ScummVm.hrh index 316e4d08f6..f756912d96 100644 --- a/backends/platform/symbian/src/ScummVm.hrh +++ b/backends/platform/symbian/src/ScummVm.hrh @@ -2,7 +2,7 @@ * 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-2014 The ScummVM Team + * Copyright (C) 2005-2015 The ScummVM Team * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT -- cgit v1.2.3 From 627d766325e1d435816648f85dbf9c007269b3f2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 16 Feb 2015 00:49:42 +0100 Subject: SDL: Add basic abstraction class for the SDL window. --- backends/platform/symbian/src/SymbianOS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 1fca7f5df5..57903d3d26 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -109,7 +109,7 @@ void OSystem_SDL_Symbian::initBackend() { _mixerManager->init(); } if (_graphicsManager == 0) - _graphicsManager = new SymbianSdlGraphicsManager(_eventSource); + _graphicsManager = new SymbianSdlGraphicsManager(_eventSource, _window); // Call parent implementation of this method OSystem_SDL::initBackend(); -- cgit v1.2.3 From 3f22c12c56572d7c0b46e734179255062f81f45c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 16 Feb 2015 01:24:42 +0100 Subject: SDL: Handle icon setup in SdlWindow. --- backends/platform/symbian/src/SymbianOS.cpp | 6 ++---- backends/platform/symbian/src/SymbianOS.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 57903d3d26..e28b78900c 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -63,6 +63,8 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian() void OSystem_SDL_Symbian::init() { _RFs = &CEikonEnv::Static()->FsSession(); + // Use iconless window: it uses the EScummVM.aif file for the icon. + _window = new SdlIconlessWindow(); _fsFactory = new SymbianFilesystemFactory(); OSystem_SDL::init(); } @@ -171,10 +173,6 @@ Common::String OSystem_SDL_Symbian::getDefaultConfigFileName() { return configFile; } -void OSystem_SDL_Symbian::setupIcon() { - // Don't for Symbian: it uses the EScummVM.aif file for the icon. -} - RFs& OSystem_SDL_Symbian::FsSession() { return *_RFs; } diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 57a471f1a9..617540941d 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -39,7 +39,6 @@ public: virtual void engineDone(); virtual bool setGraphicsMode(const char *name); virtual Common::String getDefaultConfigFileName(); - virtual void setupIcon(); /** * Returns reference to File session -- cgit v1.2.3 From 99d6dec0597b190c76fc49169a4e5c2e93f7d366 Mon Sep 17 00:00:00 2001 From: Fedor Strizhnev Date: Mon, 14 Sep 2015 22:17:11 +0300 Subject: SYMBIAN: Fix compilation error caused by remove macro --- backends/platform/symbian/src/portdefs.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 1fb941963b..f2faa7c878 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -58,6 +58,12 @@ typedef signed long int int32; // re-define those data types. #define SCUMMVM_DONT_DEFINE_TYPES +// Hiding macro "remove" defined in unistd.h from anywere except default-saves.cpp. +// Should be after including unistd.h +#ifndef USE_SYSTEM_REMOVE +#undef remove +#endif + #define SMALL_SCREEN_DEVICE #define DISABLE_COMMAND_LINE -- cgit v1.2.3 From c7aa5cb995a41f9e4c72b37533277c1b4c9476fc Mon Sep 17 00:00:00 2001 From: Fedor Strizhnev Date: Mon, 14 Sep 2015 22:46:50 +0300 Subject: SYMBIAN: Delete obsolete fixes for 'remove' --- backends/platform/symbian/src/SymbianOS.cpp | 4 ---- backends/platform/symbian/src/portdefs.h | 1 - 2 files changed, 5 deletions(-) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index e28b78900c..4d417b5a66 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -197,7 +197,3 @@ void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size return NULL; } -int remove(const char *path) -{ - return unlink(path); -} diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index f2faa7c878..d0769136b2 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -68,7 +68,6 @@ typedef signed long int int32; #define DISABLE_COMMAND_LINE #define USE_RGB_COLOR -int remove(const char *path); #if defined(USE_TREMOR) && !defined(USE_VORBIS) #define USE_VORBIS // make sure this one is defined together with USE_TREMOR! -- cgit v1.2.3 From bf822e7dc03327da937cb37cb4cc9f9e1af3f4b5 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 14 Sep 2015 22:43:01 +0200 Subject: SYMBIAN: Rename define and rephrase comments --- backends/platform/symbian/src/portdefs.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'backends/platform/symbian/src') diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index d0769136b2..f9da09d3eb 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -58,9 +58,10 @@ typedef signed long int int32; // re-define those data types. #define SCUMMVM_DONT_DEFINE_TYPES -// Hiding macro "remove" defined in unistd.h from anywere except default-saves.cpp. -// Should be after including unistd.h -#ifndef USE_SYSTEM_REMOVE +// Hide the macro "remove" defined in unistd.h from anywere except where +// we explicitly require it. This lets us use the name "remove" in engines. +// Must be after including unistd.h . +#ifndef SYMBIAN_USE_SYSTEM_REMOVE #undef remove #endif -- cgit v1.2.3