diff options
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/psp/psp.mk | 38 | ||||
-rw-r--r-- | backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg | 2 | ||||
-rw-r--r-- | backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg | 2 | ||||
-rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 2 | ||||
-rw-r--r-- | backends/platform/symbian/src/portdefs.h | 4 | ||||
-rw-r--r-- | backends/platform/wii/gx_supp.cpp | 6 |
6 files changed, 45 insertions, 9 deletions
diff --git a/backends/platform/psp/psp.mk b/backends/platform/psp/psp.mk index ff81a567d6..10e272a593 100644 --- a/backends/platform/psp/psp.mk +++ b/backends/platform/psp/psp.mk @@ -1,6 +1,38 @@ -all: psp_fixup_elf +all: pack_pbp +clean: psp_clean -psp_fixup_elf: scummvm.elf + +PSP_EXE := scummvm$(EXEEXT) +PSP_EXE_STRIPPED := scummvm_stripped$(EXEEXT) +PSP_EBOOT = EBOOT.PBP +PSP_EBOOT_SFO = param.sfo +PSP_EBOOT_TITLE = ScummVM-PSP +DATE = $(shell date +%Y%m%d) + +MKSFO = mksfo +PACK_PBP = pack-pbp + +$(PSP_EXE_STRIPPED): $(PSP_EXE) + $(STRIP) $< -o $@ + +$(PSP_EBOOT_SFO): $(PSP_EXE) + $(MKSFO) '$(PSP_EBOOT_TITLE) r$(VER_SVNREV) ($(DATE))' $@ + +psp_clean: + $(RM) $(PSP_EXE_STRIPPED) $(PSP_EBOOT) $(PSP_EBOOT_SFO) + +psp_fixup_elf: $(PSP_EXE_STRIPPED) $(PSPDEV)/bin/psp-fixup-imports $< -.PHONY: psp_fixup_elf +pack_pbp: psp_fixup_elf $(PSP_EBOOT_SFO) + $(PACK_PBP) $(PSP_EBOOT) \ + $(PSP_EBOOT_SFO) \ + $(srcdir)/backends/platform/psp/icon0.png \ + NULL \ + $(srcdir)/backends/platform/psp/pic0.png \ + $(srcdir)/backends/platform/psp/pic1.png \ + NULL \ + $(PSP_EXE_STRIPPED) \ + NULL + +.PHONY: psp_fixup_elf pack_pbp diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index fe82cb7b4e..19b4d67961 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -34,7 +34,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM S60v3"},(0xA0000657),0,14,0 +#{"ScummVM S60v3"},(0xA0000657),1,0,0 ;Supports Series 60 v 3.0 [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 5a8d317fbc..a500e92529 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -32,7 +32,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM UIQ3"},(0xA0000657),0,14,0 +#{"ScummVM UIQ3"},(0xA0000657),1,0,0 ; ProductID for UIQ 3.0 ; Product/platform version UID, Major, Minor, Build, Product ID diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index 5f5551422e..58ede5988f 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -104,6 +104,8 @@ SymbianActions::SymbianActions() void SymbianActions::initInstanceMain(OSystem *mainSystem) { int i; + // Need to do this since all old mappings are reset after engineDone + _initialized = false; Actions::initInstanceMain(mainSystem); // Disable all mappings before setting main mappings again diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 3c2286d154..9059ae9e49 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -127,7 +127,9 @@ #define USE_ARM_COSTUME_ASM #define USE_ARM_SOUND_ASM #endif -#define ENABLE_KEYMAPPER +// This is not really functioning yet. +// Default SDL keys should map to standard keys I think! +//#define ENABLE_KEYMAPPER // 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 *)); diff --git a/backends/platform/wii/gx_supp.cpp b/backends/platform/wii/gx_supp.cpp index 34cd31fd13..f33adae566 100644 --- a/backends/platform/wii/gx_supp.cpp +++ b/backends/platform/wii/gx_supp.cpp @@ -57,9 +57,9 @@ static float tex_xT = 0.0f, tex_yT = 0.0f; /* New texture based scaler */ typedef struct tagcamera { - Vector pos; - Vector up; - Vector view; + guVector pos; + guVector up; + guVector view; } camera; static s16 square[] ATTRIBUTE_ALIGN(32) = { |