libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SYMBIAN platform. Correct building of SDL refacturing for Symbian.

Browse Source 
svn-id: r51587
This commit is contained in:
Lars Persson 2010-08-01 19:40:46 +00:00
parent 7f8e7fc29d
commit 2e55bcf383
11 changed files with 64 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/audiocd/sdl/sdl-audiocd.cpp
View File

@ -23,7 +23,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(__SYMBIAN32__)
#include "backends/audiocd/sdl/sdl-audiocd.h"

2
backends/events/sdl/sdl-events.cpp
View File

@ -23,7 +23,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(__SYMBIAN32__)
#include "backends/events/sdl/sdl-events.h"
#include "backends/platform/sdl/sdl.h"

2
backends/graphics/sdl/sdl-graphics.cpp
View File

@ -23,7 +23,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined (__SYMBIAN32__)
#include "backends/graphics/sdl/sdl-graphics.h"
#include "backends/events/sdl/sdl-events.h"

2
backends/mixer/sdl/sdl-mixer.cpp
View File

@ -23,7 +23,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined (__SYMBIAN32__)
#include "backends/mixer/sdl/sdl-mixer.h"
#include "common/system.h"

2
backends/mutex/sdl/sdl-mutex.cpp
View File

@ -23,7 +23,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(__SYMBIAN32__)
#include "backends/mutex/sdl/sdl-mutex.h"

43
backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
View File

@ -42,12 +42,12 @@
'zlib' => 'zlib.lib',
'mad' => 'libmad.lib',
'tremor' => 'libtremor.lib',
'mpeg2' => 'libmpeg2.lib'
'flac' => 'libflac.lib'
);
# these are normally enabled for each variation
#$DefaultFeatures = qw(zlib,mad);
$DefaultFeatures = qw(zlib,mad,tremor);
$DefaultFeatures = qw(zlib,mad,tremor,flac);
##################################################################################################################
##
@ -229,6 +229,45 @@
# now you can add $VariationSets only built on this PC below this line :)
}
elsif ($ENV{'COMPUTERNAME'} eq "EMBEDDEV_VAIO1") #################################################################
{
$Producer = "AnotherGuest";
$RedirectSTDERR = 1;
$HaltOnError = 0;
$SkipExistingPackages = 1;
$ReallyQuiet = 1;
#$FTP_Host = "host.com";
#$FTP_User = "ag@host.com";
#$FTP_Pass = "password";
#$FTP_Dir = "cvsbuilds";
#$SDK_RootDirs{'UIQ2'}= "D:\\UIQ2";
$SDK_RootDirs{'UIQ3'}= "G:\\UIQ3";
#$SDK_RootDirs{'S60v1'}= "D:\\S60v1";
#$SDK_RootDirs{'S60v2'}= "D:\\S60v2";
$SDK_RootDirs{'S60v3'}= "G:\\S60v3";
#$SDK_RootDirs{'S80'}= "D:\\S80";
#$SDK_RootDirs{'S90'}= "D:\\S90";
$ECompXL_BinDir= "D:\\ECompXL\\";
if (0) # so we can turn them on/off easily
{
# $SDK_LibraryDirs{'ALL'}{'zlib.lib'} = "C:\\S\\zlib-1.2.2\\epoc";
# $SDK_LibraryDirs{'ALL'}{'libmad.lib'} = "C:\\S\\libmad-0.15.1b\\group";
# $SDK_LibraryDirs{'ALL'}{'libtremor.lib'}= "C:\\tremor\\epoc";
$SDK_LibraryDirs{'UIQ2'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\UIQ";
$SDK_LibraryDirs{'S60v1'}{'esdl.lib'} = $SDK_LibraryDirs{'S60v2'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\S60";
$SDK_LibraryDirs{'S80'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\S80";
$SDK_LibraryDirs{'S90'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\S90";
$SDK_LibraryDirs{'S60v3'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\S60\\S60V3";
$SDK_LibraryDirs{'UIQ3'}{'esdl.lib'} = "E:\\WICKED\\ESDL\\epoc\\UIQ\\UIQ3";
#$SDK_LibraryDirs{'ALL'}{'libmpeg2.lib'} = "C:\\S\\mpeg2dec-0.4.0\\epoc";
}
# now you can add $VariationSets only built on this PC below this line :)
}
else #########################################################################################################
{
print "ERROR: Computer name ".$ENV{'COMPUTERNAME'}." not recognized! Plz edit _LocalSettings.pl!";

3
backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
View File

@ -112,14 +112,13 @@ SOURCEPATH ..\..\..\..\base
SOURCEPATH ..\..\..\..
// backend EPOC/SDL/ESDL specific includes
SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\platform\sdl\sdl.cpp
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE backends\platform\symbian\src\Main.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp

3
backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
View File

@ -112,14 +112,13 @@ SOURCEPATH ..\..\..\..\base
SOURCEPATH ..\..\..\..
// backend EPOC/SDL/ESDL specific includes
SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\hardwarekeys.cpp
SOURCE backends\platform\sdl\sdl.cpp
SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE backends\platform\symbian\src\Main.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp

13
backends/platform/symbian/mmp/scummvm_base.mmp.in
View File

@ -108,6 +108,7 @@ SOURCE rate_arm_asm.s // ARM version: add ASM routines
// add a few files manually, since they are not parsed from modules.mk files
SOURCEPATH ..\..\..\..
SOURCE base\main.cpp
SOURCE backends\events\default\default-events.cpp
SOURCE backends\timer\default\default-timer.cpp
SOURCE backends\saves\savefile.cpp
@ -120,12 +121,24 @@ SOURCE engines\game.cpp
SOURCE engines\advanceddetector.cpp
SOURCE engines\savestate.cpp
// backend specific includes
SOURCE backends\modular-backend.cpp
SOURCE backends\audiocd\default\default-audiocd.cpp
SOURCE backends\audiocd\sdl\sdl-audiocd.cpp
SOURCE backends\events\sdl\sdl-events.cpp
SOURCE backends\events\symbiansdl\symbiansdl-events.cpp
SOURCE backends\fs\abstract-fs.cpp
SOURCE backends\fs\symbian\symbianstream.cpp
SOURCE backends\graphics\sdl\sdl-graphics.cpp
SOURCE backends\graphics\symbiansdl\symbiansdl-graphics.cpp
SOURCE backends\keymapper\action.cpp
SOURCE backends\keymapper\keymap.cpp
SOURCE backends\keymapper\keymapper.cpp
SOURCE backends\keymapper\remap-dialog.cpp
SOURCE backends\mixer\sdl\sdl-mixer.cpp
SOURCE backends\mixer\symbiansdl\symbiansdl-mixer.cpp
SOURCE backends\mutex\sdl\sdl-mutex.cpp
SOURCE backends\timer\sdl\sdl-timer.cpp
// Source files for virtual keyboard
SOURCE backends\vkeybd\image-map.cpp
SOURCE backends\vkeybd\polygon.cpp

2
backends/timer/sdl/sdl-timer.cpp
View File

@ -24,7 +24,7 @@
*
*/
#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined (__SYMBIAN32__)
#include "backends/timer/sdl/sdl-timer.h"

2
gui/ThemeEngine.h
View File

@ -37,6 +37,7 @@
namespace Graphics {
struct DrawStep;
class VectorRenderer;
class Font;
}
namespace GUI {
@ -52,6 +53,7 @@ class ThemeEval;
class ThemeItem;
class ThemeParser;
/**
* DrawData sets enumeration.
* Each DD set corresponds to the actual looks