RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix gp2x compilation (using linaro arm gcc 4.7 on ubuntu)

Browse source
This commit is contained in:
kub 2019-03-15 20:51:51 +01:00 • committed by kub
parent 7ddd8501a7
commit c79d0bb90f
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/common/common.mak
View file

@ -181,7 +181,7 @@ $(FR)cpu/cyclone/Cyclone.h:
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
@echo building Cyclone...
@make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG)
@make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h

6
platform/gp2x/emu.c
View file

@ -298,12 +298,12 @@ static int make_local_pal_md(int fast_mode)
{
int pallen = 0xc0;
bgr444_to_rgb32(localPal, Pico.cram);
bgr444_to_rgb32(localPal, PicoMem.cram);
if (fast_mode)
return 0x40;
if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode
bgr444_to_rgb32_sh(localPal, Pico.cram);
bgr444_to_rgb32_sh(localPal, PicoMem.cram);
localPal[0xc0] = 0x0000c000;
localPal[0xd0] = 0x00c00000;
localPal[0xe0] = 0x00000000; // reserved pixels for OSD
@ -322,7 +322,7 @@ static int make_local_pal_md(int fast_mode)
static int make_local_pal_sms(int fast_mode)
{
unsigned short *spal = Pico.cram;
unsigned short *spal = PicoMem.cram;
unsigned int *dpal = (void *)localPal;
unsigned int i, t;