mirror of
https://github.com/libretro/scummvm.git
synced 2025-05-13 09:36:21 +00:00
SYMBIAN : Updated for proper FORBIDDEN handling, added cdaudio support needed, updated version nr
svn-id: r54378
This commit is contained in:
parent
5d53673e93
commit
17d8fafedd
@ -119,6 +119,8 @@ SOURCE backends\platform\sdl\events.cpp
|
|||||||
SOURCE backends\platform\sdl\graphics.cpp
|
SOURCE backends\platform\sdl\graphics.cpp
|
||||||
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
||||||
SOURCE backends\platform\sdl\sdl.cpp
|
SOURCE backends\platform\sdl\sdl.cpp
|
||||||
|
SOURCE backends\audiocd\sdl\SDL-audiocd.cpp
|
||||||
|
SOURCE backends\audiocd\default\default-audiocd.cpp
|
||||||
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
||||||
@ -144,3 +146,4 @@ LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
|||||||
library avkon.lib bafl.lib
|
library avkon.lib bafl.lib
|
||||||
|
|
||||||
CAPABILITY LocalServices ReadUserData
|
CAPABILITY LocalServices ReadUserData
|
||||||
|
MACRO SDL_BACKEND
|
@ -119,6 +119,8 @@ SOURCE backends\platform\sdl\events.cpp
|
|||||||
SOURCE backends\platform\sdl\graphics.cpp
|
SOURCE backends\platform\sdl\graphics.cpp
|
||||||
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
||||||
SOURCE backends\platform\sdl\sdl.cpp
|
SOURCE backends\platform\sdl\sdl.cpp
|
||||||
|
SOURCE backends\audiocd\sdl\SDL-audiocd.cpp
|
||||||
|
SOURCE backends\audiocd\default\default-audiocd.cpp
|
||||||
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
||||||
@ -144,3 +146,4 @@ LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
|||||||
library avkon.lib bafl.lib
|
library avkon.lib bafl.lib
|
||||||
|
|
||||||
CAPABILITY LocalServices ReadUserData
|
CAPABILITY LocalServices ReadUserData
|
||||||
|
MACRO SDL_BACKEND
|
@ -36,7 +36,7 @@
|
|||||||
:"ScummVM"
|
:"ScummVM"
|
||||||
|
|
||||||
; UID is the app's UID
|
; UID is the app's UID
|
||||||
#{"ScummVM S60v3"},(0xA0000657),1,13,0
|
#{"ScummVM S60v3"},(0xA0000657),1,30,0
|
||||||
|
|
||||||
;Supports Series 60 v 3.0
|
;Supports Series 60 v 3.0
|
||||||
[0x101F7961], 0, 0, 0, {"Series60ProductID"}
|
[0x101F7961], 0, 0, 0, {"Series60ProductID"}
|
||||||
|
@ -117,6 +117,8 @@ SOURCE backends\platform\sdl\events.cpp
|
|||||||
SOURCE backends\platform\sdl\graphics.cpp
|
SOURCE backends\platform\sdl\graphics.cpp
|
||||||
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
||||||
SOURCE backends\platform\sdl\sdl.cpp
|
SOURCE backends\platform\sdl\sdl.cpp
|
||||||
|
SOURCE backends\audiocd\sdl\SDL-audiocd.cpp
|
||||||
|
SOURCE backends\audiocd\default\default-audiocd.cpp
|
||||||
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
||||||
@ -141,3 +143,4 @@ LIBRARY gdi.lib hal.lib bitgdi.lib
|
|||||||
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
||||||
LIBRARY qikctl.lib
|
LIBRARY qikctl.lib
|
||||||
library qikcore.lib bafl.lib eikcoctl.lib
|
library qikcore.lib bafl.lib eikcoctl.lib
|
||||||
|
MACRO SDL_BACKEND
|
@ -117,6 +117,8 @@ SOURCE backends\platform\sdl\events.cpp
|
|||||||
SOURCE backends\platform\sdl\graphics.cpp
|
SOURCE backends\platform\sdl\graphics.cpp
|
||||||
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
SOURCE backends\platform\sdl\hardwarekeys.cpp
|
||||||
SOURCE backends\platform\sdl\sdl.cpp
|
SOURCE backends\platform\sdl\sdl.cpp
|
||||||
|
SOURCE backends\audiocd\sdl\SDL-audiocd.cpp
|
||||||
|
SOURCE backends\audiocd\default\default-audiocd.cpp
|
||||||
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
SOURCE backends\platform\symbian\src\SymbianOS.cpp
|
||||||
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
SOURCE backends\platform\symbian\src\SymbianActions.cpp
|
||||||
@ -141,3 +143,4 @@ LIBRARY gdi.lib hal.lib bitgdi.lib
|
|||||||
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
|
||||||
LIBRARY qikctl.lib
|
LIBRARY qikctl.lib
|
||||||
library qikcore.lib bafl.lib eikcoctl.lib
|
library qikcore.lib bafl.lib eikcoctl.lib
|
||||||
|
MACRO SDL_BACKEND
|
@ -35,7 +35,7 @@
|
|||||||
:"ScummVM"
|
:"ScummVM"
|
||||||
|
|
||||||
; UID is the app's UID
|
; UID is the app's UID
|
||||||
#{"ScummVM UIQ3"},(0xA0000657),1,13,0
|
#{"ScummVM UIQ3"},(0xA0000657),1,30,0
|
||||||
|
|
||||||
; ProductID for UIQ 3.0
|
; ProductID for UIQ 3.0
|
||||||
; Product/platform version UID, Major, Minor, Build, Product ID
|
; Product/platform version UID, Major, Minor, Build, Product ID
|
||||||
|
@ -24,6 +24,9 @@
|
|||||||
|
|
||||||
#include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
|
#include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
|
||||||
#include <bautils.h>
|
#include <bautils.h>
|
||||||
|
#include <eikenv.h>
|
||||||
|
#define FORBIDDEN_SYMBOL_EXCEPTION_fclose
|
||||||
|
#define FORBIDDEN_SYMBOL_EXCEPTION_fopen
|
||||||
|
|
||||||
#include "backends/fs/symbian/symbian-fs-factory.h"
|
#include "backends/fs/symbian/symbian-fs-factory.h"
|
||||||
#include "backends/platform/symbian/src/SymbianOS.h"
|
#include "backends/platform/symbian/src/SymbianOS.h"
|
||||||
|
@ -130,6 +130,7 @@
|
|||||||
// Symbian bsearch implementation is flawed
|
// Symbian bsearch implementation is flawed
|
||||||
void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *));
|
void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *));
|
||||||
#define bsearch scumm_bsearch
|
#define bsearch scumm_bsearch
|
||||||
|
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
|
||||||
|
|
||||||
// we cannot include SymbianOS.h everywhere, but this works too (functions code is in SymbianOS.cpp)
|
// we cannot include SymbianOS.h everywhere, but this works too (functions code is in SymbianOS.cpp)
|
||||||
namespace Symbian {
|
namespace Symbian {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user