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

libretro, build fixes

Browse source
This commit is contained in:
kub 2020-07-10 17:53:32 +02:00
parent 55c3c2b02f
commit 03d5f5105c
7 changed files with 63 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -24,7 +24,6 @@ endif
ifndef NO_ALIGN_FUNCTIONS ifndef NO_ALIGN_FUNCTIONS
CFLAGS += -falign-functions=2 CFLAGS += -falign-functions=2
endif endif
LDFLAGS += -Wl,--gc-sections
# profiling # profiling
pprof ?= 0 pprof ?= 0
@ -64,27 +63,13 @@ asm_cdmemory ?= 1
asm_mix ?= 1 asm_mix ?= 1
asm_32xdraw ?= 1 asm_32xdraw ?= 1
asm_32xmemory ?= 1 asm_32xmemory ?= 1
else ifneq (,$(findstring 86,$(ARCH))) else
use_fame ?= 1
use_cz80 ?= 1
use_sh2drc ?= 1
else ifneq (,$(findstring mips,$(ARCH)))
use_fame ?= 1
use_cz80 ?= 1
use_sh2drc ?= 1
else ifneq (,$(findstring aarch64,$(ARCH)))
use_fame ?= 1
use_cz80 ?= 1
use_sh2drc ?= 1
else ifneq (,$(findstring riscv,$(ARCH)))
use_fame ?= 1
use_cz80 ?= 1
use_sh2drc ?= 1
else ifneq (,$(findstring powerpc,$(ARCH)))
use_fame ?= 1 use_fame ?= 1
use_cz80 ?= 1 use_cz80 ?= 1
ifneq (,$(filter "$(ARCH)","x86" "i386" "mips" "aarch64" "riscv" "powerpc"))
use_sh2drc ?= 1 use_sh2drc ?= 1
endif endif
endif
-include Makefile.local -include Makefile.local

194
Makefile.libretro
View file

@ -8,10 +8,6 @@ ifeq ($(platform),)
platform = win platform = win
else ifneq ($(findstring Darwin,$(shell uname -a)),) else ifneq ($(findstring Darwin,$(shell uname -a)),)
platform = osx platform = osx
arch = intel
ifeq ($(shell uname -p),powerpc)
arch = ppc
endif
else ifneq ($(findstring win,$(shell uname -a)),) else ifneq ($(findstring win,$(shell uname -a)),)
platform = win platform = win
endif endif
@ -31,15 +27,6 @@ ifneq ($(GIT_VERSION),"unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif endif
asm_memory = 0
asm_render = 0
asm_ym2612 = 0
asm_misc = 0
asm_cdmemory = 0
asm_mix = 0
asm_32xdraw = 0
asm_32xmemory = 0
fpic := fpic :=
ifeq ($(STATIC_LINKING),1) ifeq ($(STATIC_LINKING),1)
@ -54,7 +41,6 @@ ifeq ($(platform), unix)
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
use_sh2drc = 1
# Portable Linux # Portable Linux
else ifeq ($(platform), linux-portable) else ifeq ($(platform), linux-portable)
@ -65,7 +51,6 @@ else ifeq ($(platform), linux-portable)
LIBM := LIBM :=
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
use_sh2drc = 1
# OS X # OS X
else ifeq ($(platform), osx) else ifeq ($(platform), osx)
@ -74,14 +59,8 @@ else ifeq ($(platform), osx)
SHARED := -dynamiclib SHARED := -dynamiclib
fpic := -fPIC fpic := -fPIC
APPLE := 1 APPLE := 1
arch = intel
ifeq ($(shell uname -p),powerpc) ifeq ($(shell uname -p),powerpc)
arch = ppc
endif
ifeq ($(arch),ppc)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
else
use_sh2drc = 1
endif endif
OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
@ -103,15 +82,8 @@ else ifeq ($(platform), staticios)
CXX += -miphoneos-version-min=8.0 CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0 CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0 CFLAGS += -miphoneos-version-min=8.0
ARCH := aarch64
STATIC_LINKING = 1 STATIC_LINKING = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
use_svpdrc = 0
# iOS # iOS
else ifneq (,$(findstring ios,$(platform))) else ifneq (,$(findstring ios,$(platform)))
@ -139,15 +111,8 @@ else
CXX += -miphoneos-version-min=5.0 CXX += -miphoneos-version-min=5.0
CC_AS += -miphoneos-version-min=5.0 CC_AS += -miphoneos-version-min=5.0
CFLAGS += -miphoneos-version-min=5.0 CFLAGS += -miphoneos-version-min=5.0
use_svpdrc = 0
endif endif
ARCH := arm
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
use_svpdrc = 1
# PS3 # PS3
else ifeq ($(platform), ps3) else ifeq ($(platform), ps3)
@ -159,14 +124,9 @@ else ifeq ($(platform), ps3)
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# sncps3 # sncps3
else ifeq ($(platform), sncps3) else ifeq ($(platform), sncps3)
ARCH = powerpc
TARGET := $(TARGET_NAME)_libretro_ps3.a TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
@ -175,12 +135,6 @@ else ifeq ($(platform), sncps3)
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# Lightweight PS3 Homebrew SDK # Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght) else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
@ -191,74 +145,45 @@ else ifeq ($(platform), psl1ght)
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# PSP # PSP
else ifeq ($(platform), psp1) else ifeq ($(platform), psp1)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = psp-gcc$(EXE_EXT) CC = psp-gcc$(EXE_EXT)
AR = psp-ar$(EXE_EXT) AR = psp-ar$(EXE_EXT)
CFLAGS += -G0 -ftracer CFLAGS += -G0 -ftracer
CFLAGS += -DPSP CFLAGS += -DPSP
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
asm_render = 1 asm_render = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# CTR (3DS) # CTR (3DS)
else ifeq ($(platform), ctr) else ifeq ($(platform), ctr)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT) CC = $(DEVKITARM)/bin/arm-none-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT) CXX = $(DEVKITARM)/bin/arm-none-eabi-g++$(EXE_EXT)
AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT) AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
CFLAGS += -DARM11 -D_3DS CFLAGS += -DARM11 -D_3DS
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp
CFLAGS += -Wall -mword-relocations CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
ARCH = arm
ARM_ASM = 1
use_cyclone = 1 OBJS +=platform/libretro/3ds/3ds_utils.o
use_fame = 0
use_drz80 = 1
use_cz80 = 0
use_sh2drc = 1
use_svpdrc = 1
OBJS +=platform/libretro/3ds/3ds_utils.o
# Raspberry Pi (original model) Raspbian # Raspberry Pi (original model) Raspbian
else ifeq ($(platform), raspberrypi) else ifeq ($(platform), raspberrypi)
CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j
CFLAGS += -Wall -mword-relocations CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
ARCH = arm
ARM_ASM = 1
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
SHARED := -shared SHARED := -shared
fpic := -fPIC fpic := -fPIC
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
use_cyclone = 1
use_fame = 0
use_drz80 = 1
use_cz80 = 0
use_sh2drc = 1
use_svpdrc = 1
# Vita # Vita
else ifeq ($(platform), vita) else ifeq ($(platform), vita)
@ -273,15 +198,6 @@ else ifeq ($(platform), vita)
STATIC_LINKING = 1 STATIC_LINKING = 1
NO_MMAP = 1 NO_MMAP = 1
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
ARCH = arm
ARM_ASM = 1
use_cyclone = 1
use_fame = 0
use_drz80 = 1
use_cz80 = 0
use_sh2drc = 1
use_svpdrc = 1
# Xbox 360 # Xbox 360
else ifeq ($(platform), xenon) else ifeq ($(platform), xenon)
@ -313,14 +229,6 @@ else ifeq ($(platform), qnx)
CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
ASFLAGS += -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp ASFLAGS += -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
ARCH = arm ARCH = arm
ARM_ASM = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
use_svpdrc = 1
# ARM # ARM
else ifneq (,$(findstring armv,$(platform))) else ifneq (,$(findstring armv,$(platform)))
@ -353,21 +261,16 @@ else ifneq (,$(findstring armv,$(platform)))
CFLAGS += -mfloat-abi=hard CFLAGS += -mfloat-abi=hard
ASFLAGS += -mfloat-abi=hard ASFLAGS += -mfloat-abi=hard
endif endif
ifneq (,$(findstring armasm,$(platform))) ifeq (,$(findstring armasm,$(platform)))
ARM_ASM = 1 NO_ARM_ASM = 1
endif endif
ARCH = arm
# Emscripten # Emscripten
else ifeq ($(platform), emscripten) else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc TARGET := $(TARGET_NAME)_libretro_$(platform).bc
STATIC_LINKING = 1 ARCH = unknown
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
# GCW0 # GCW0
else ifeq ($(platform), gcw0) else ifeq ($(platform), gcw0)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
@ -379,12 +282,6 @@ else ifeq ($(platform), gcw0)
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float CFLAGS += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# Windows # Windows
else else
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
@ -401,15 +298,20 @@ ifeq ($(NO_MMAP),1)
CFLAGS += -DNO_MMAP CFLAGS += -DNO_MMAP
endif endif
ifeq ($(ARM_ASM),1) ifeq ($(NO_ARM_ASM),1)
asm_memory = 1 use_cyclone = 0
asm_render = 1 use_fame ?= 1
asm_ym2612 = 1 use_drz80 = 0
asm_misc = 1 use_cz80 ?= 1
asm_cdmemory = 1
asm_mix = 1 asm_memory = 0
asm_32xdraw = 1 asm_render = 0
asm_32xmemory = 1 asm_ym2612 = 0
asm_misc = 0
asm_cdmemory = 0
asm_mix = 0
asm_32xdraw = 0
asm_32xmemory = 0
endif endif
CFLAGS += $(fpic) CFLAGS += $(fpic)
@ -421,7 +323,7 @@ endif
SHARED ?= -shared SHARED ?= -shared
LDFLAGS += $(SHARED) $(fpic) LDFLAGS += $(SHARED) $(fpic)
ifneq ($(ARCH), arm) ifeq ($(ARCH),)
ARCH = $(shell $(CC) -dumpmachine | awk -F '-' '{print $$1}') ARCH = $(shell $(CC) -dumpmachine | awk -F '-' '{print $$1}')
endif endif
PLATFORM = libretro PLATFORM = libretro

2
pico/pico_int.h
View file

@ -33,12 +33,14 @@ extern "C" {
#endif #endif
#ifdef UTYPES_DEFINED
typedef uint8_t u8; typedef uint8_t u8;
typedef int8_t s8; typedef int8_t s8;
typedef uint16_t u16; typedef uint16_t u16;
typedef int16_t s16; typedef int16_t s16;
typedef uint32_t u32; typedef uint32_t u32;
typedef int32_t s32; typedef int32_t s32;
#endif
typedef uintptr_t uptr; // unsigned pointer-sized int typedef uintptr_t uptr; // unsigned pointer-sized int
// ----------------------- 68000 CPU ----------------------- // ----------------------- 68000 CPU -----------------------

3
platform/gizmondo/Makefile
View file

@ -98,6 +98,9 @@ ifeq "$(profile)" "1"
endif endif
../../tools/textfilter: ../../tools/textfilter.c
make -C ../../tools/ textfilter
readme.txt: ../../tools/textfilter ../base_readme.txt readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GIZ ../../tools/textfilter ../base_readme.txt $@ GIZ

2
platform/gp2x/Makefile
View file

@ -11,7 +11,7 @@ endif
all: rel all: rel
../../tools/textfilter: ../../tools/textfilter.c ../../tools/textfilter: ../../tools/textfilter.c
make -C ../../tools/ make -C ../../tools/ textfilter
readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
../../tools/textfilter ../base_readme.txt $@ GP2X ../../tools/textfilter ../base_readme.txt $@ GP2X

2
platform/pandora/Makefile
View file

@ -13,7 +13,7 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
all: rel all: rel
../../tools/textfilter: ../../tools/textfilter.c ../../tools/textfilter: ../../tools/textfilter.c
make -C ../../tools/ make -C ../../tools/ textfilter
#readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog #readme.txt: ../../tools/textfilter ../base_readme.txt ../../ChangeLog
# ../../tools/textfilter ../base_readme.txt $@ PANDORA # ../../tools/textfilter ../base_readme.txt $@ PANDORA

7
tools/Makefile
View file

@ -1,9 +1,12 @@
TARGETS = amalgamate textfilter TARGETS = amalgamate textfilter
OBJS = $(addsuffix .o,$(TARGETS)) HOSTCC ?= cc
all: $(TARGETS) all:
CC="$(XCC)" CFLAGS="$(XCFLAGS)" sh ./mkoffsets.sh ../pico CC="$(XCC)" CFLAGS="$(XCFLAGS)" sh ./mkoffsets.sh ../pico
$(TARGETS): $(addsuffix .c,$(TARGETS))
$(HOSTCC) -o $@ -O $@.c
clean: clean:
$(RM) $(TARGETS) $(OBJS) $(RM) $(TARGETS) $(OBJS)