Merge from libretro/master:7ff457f for repo synchronization

This commit is contained in:
kub 2022-04-19 23:58:59 +02:00
parent 45d0add214
commit a5085db3ea
19 changed files with 1015 additions and 311 deletions

View file

@ -35,7 +35,9 @@ CFLAGS += -I platform/libretro/libretro-common/include/string
CFLAGS += -I platform/libretro/libretro-common/include/vfs
USE_LIBRETRO_VFS := 1
STATIC_LINKING := 0
STATIC_LINKING:= 0
STATIC_LINKING_LINK:= 0
LOW_MEMORY := 0
TARGET_NAME := picodrive
LIBM := -lm
GIT_VERSION ?= $(shell git rev-parse --short HEAD || echo unknown)
@ -60,6 +62,24 @@ ifneq ($(findstring SunOS,$(shell uname -a)),)
CC=gcc
endif
# x86/x86_64 generic
else ifneq (,$(findstring x86,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
ARCH := 86
fpic := -fPIC
SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS
# AARCH64 generic
else ifeq ($(platform), aarch64)
TARGET := $(TARGET_NAME)_libretro.so
ARCH = aarch64
fpic := -fPIC
SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS
# Portable Linux
else ifeq ($(platform), linux-portable)
EXT ?= so
@ -76,13 +96,20 @@ else ifeq ($(platform), osx)
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
ifeq ($(shell uname -p),powerpc)
CFLAGS += -DHAVE_NO_LANGEXTRA
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
endif
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
SHARED += -mmacosx-version-min=10.6
ifeq ($(CROSS_COMPILE),1)
TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
CFLAGS += $(TARGET_RULE)
CPPFLAGS += $(TARGET_RULE)
CXXFLAGS += $(TARGET_RULE)
LDFLAGS += $(TARGET_RULE)
endif
ifndef ($(NOUNIVERSAL))
CFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
endif
CFLAGS += -DUINT8=uint8_t -DUINT16=uint16_t -DUINT32=uint32_t -DINT8=int8_t -DINT16=int16_t -DINT32=int32_t
else ifeq ($(platform), staticios)
TARGET := $(TARGET_NAME)_libretro_ios.a
@ -102,13 +129,15 @@ else ifeq ($(platform), staticios)
CFLAGS += -miphoneos-version-min=8.0
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# iOS
else ifneq (,$(findstring ios,$(platform)))
TARGET := $(TARGET_NAME)_libretro_ios.dylib
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
TARGET := $(TARGET_NAME)_libretro_ios.dylib
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
MINVERSION :=
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
@ -127,16 +156,14 @@ else ifneq (,$(findstring ios,$(platform)))
CFLAGS += -DIOS
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
CC_AS += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
MINVERSION = -miphoneos-version-min=8.0
else
CC += -miphoneos-version-min=5.0
CXX += -miphoneos-version-min=5.0
CC_AS += -miphoneos-version-min=5.0
CFLAGS += -miphoneos-version-min=5.0
MINVERSION = -miphoneos-version-min=5.0
endif
CC += $(MINVERSION)
CXX += $(MINVERSION)
CC_AS += $(MINVERSION)
CFLAGS += $(MINVERSION)
# tvOS
else ifeq ($(platform), tvos-arm64)
@ -144,45 +171,27 @@ else ifeq ($(platform), tvos-arm64)
SHARED := -dynamiclib
fpic := -fPIC
APPLE := 1
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CC = clang -arch arm64 -isysroot $(IOSSDK)
CXX = clang++ -arch arm64 -isysroot $(IOSSDK)
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CC = cc -arch arm64 -isysroot $(IOSSDK)
CXX = c++ -arch arm64 -isysroot $(IOSSDK)
CFLAGS += -marm -DARM -D__aarch64__=1
CFLAGS += -DIOS
# PS3
else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
STATIC_LINKING = 1
# PS3 has memory mapped in a way not suitable for DRC
use_sh2drc = 0
use_svpdrc = 0
# sncps3
else ifeq ($(platform), sncps3)
ARCH = powerpc
TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
STATIC_LINKING = 1
# PS3 has memory mapped in a way not suitable for DRC
use_sh2drc = 0
use_svpdrc = 0
# Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght)
else ifneq (,$(filter $(platform), ps3 psl1ght))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
CC = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-$(COMMONLV)ar$(EXE_EXT)
CFLAGS += -DFAMEC_NO_GOTOS -D__PS3__
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
NO_MMAP = 1
ifeq ($(platform), psl1ght)
FLAGS += -D__PSL1GHT__
endif
# PS3 has memory mapped in a way not suitable for DRC
use_sh2drc = 0
use_svpdrc = 0
@ -193,20 +202,21 @@ else ifeq ($(platform), psp1)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = psp-gcc$(EXE_EXT)
AR = psp-ar$(EXE_EXT)
CFLAGS += -G0 -ftracer
CFLAGS += -DPSP
CFLAGS += -DPSP -G0 -ftracer
CFLAGS += -I$(shell psp-config --pspsdk-path)/include
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# PS2
else ifeq ($(platform), ps2)
ARCH = mipsel
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = ee-gcc$(EXE_EXT)
AR = ee-ar$(EXE_EXT)
CFLAGS += -Wall -DPS2 -DUSE_BGR555 -DFAMEC_NO_GOTOS -DRENDER_GSKIT_PS2 -fsingle-precision-constant
CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT)
AR = mips64r5900el-ps2-elf-ar$(EXE_EXT)
CFLAGS += -Wall -DPS2 -D_EE -DUSE_BGR555 -DFAMEC_NO_GOTOS -DRENDER_GSKIT_PS2 -fsingle-precision-constant
CFLAGS += -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include
CFLAGS += -DHAVE_NO_LANGEXTRA
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# CTR (3DS)
else ifeq ($(platform), ctr)
@ -219,18 +229,26 @@ else ifeq ($(platform), ctr)
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
OBJS += platform/libretro/3ds/3ds_utils.o platform/libretro/3ds/utils.o
# Raspberry Pi (original model) Raspbian
else ifeq ($(platform), raspberrypi)
CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j
# Raspberry Pi
else ifneq (,$(findstring rpi,$(platform)))
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math
TARGET := $(TARGET_NAME)_libretro.so
SHARED := -shared
fpic := -fPIC
ifneq (,$(findstring rpi1,$(platform)))
CFLAGS += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6j
else ifneq (,$(findstring rpi2,$(platform)))
CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
else ifneq (,$(findstring rpi3,$(platform)))
CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
endif
# Vita
else ifeq ($(platform), vita)
@ -243,29 +261,32 @@ else ifeq ($(platform), vita)
CFLAGS += -mword-relocations -fno-unwind-tables
CFLAGS += -fno-optimize-sibling-calls
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Xbox 360
else ifeq ($(platform), xenon)
TARGET := $(TARGET_NAME)_libretro_xenon360.a
CC = xenon-gcc$(EXE_EXT)
AR = xenon-ar$(EXE_EXT)
CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
CFLAGS += -D__LIBXENON__ -m32
# Nintendo Game Cube
else ifeq ($(platform), ngc)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Wii
else ifeq ($(platform), wii)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Wii U
else ifeq ($(platform), wiiu)
@ -273,14 +294,16 @@ else ifeq ($(platform), wiiu)
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
CFLAGS += -DGEKKO -DWIIU -DHW_RVL -DHW_WUP -mwup -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
CFLAGS += -DGEKKO -DWIIU -DHW_RVL -DHW_WUP -mwup -mcpu=750 -meabi -mhard-float
STATIC_LINKING = 1
STATIC_LINKING_LINK = 1
# Nintendo Switch (libtransistor)
else ifeq ($(platform), switch)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
include $(LIBTRANSISTOR_HOME)/libtransistor.mk
STATIC_LINKING=1
STATIC_LINKING_LINK = 1
# Nintendo Switch (libnx)
else ifeq ($(platform), libnx)
@ -292,6 +315,7 @@ else ifeq ($(platform), libnx)
CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
CFLAGS += -Ifrontend/switch -ftree-vectorize
STATIC_LINKING=1
STATIC_LINKING_LINK = 1
# QNX
else ifeq ($(platform), qnx)
@ -413,6 +437,25 @@ else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
ARCH = unknown
STATIC_LINKING = 1
# RS90
else ifeq ($(platform), rs90)
TARGET := $(TARGET_NAME)_libretro.so
ifeq (,$(shell command -v $(RS90_PREFIX)mipsel-rs90-linux-uclibc-gcc 2>/dev/null))
# locate the toolchain for buildbot if it isn't in path or prefix not set
RS90_PREFIX = /opt/rs90-toolchain/usr/bin/
endif
CC = $(RS90_PREFIX)mipsel-linux-gcc
AR = $(RS90_PREFIX)mipsel-linux-ar
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32 -D__GCW0__
# clear_cache uses SYNCI instead of a syscall
CFLAGS += -DMIPS_USE_SYNCI
LOW_MEMORY = 1
# GCW0
else ifeq ($(platform), gcw0)
TARGET := $(TARGET_NAME)_libretro.so
@ -425,7 +468,38 @@ endif
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float
CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float -D__GCW0__
# clear_cache uses SYNCI instead of a syscall
CFLAGS += -DMIPS_USE_SYNCI
# RETROFW
else ifeq ($(platform), retrofw)
TARGET := $(TARGET_NAME)_libretro.so
ifeq (,$(shell command -v $(GCW0_PREFIX)mipsel-gcw0-linux-uclibc-gcc 2>/dev/null))
# locate the toolchain for buildbot if it isn't in path or prefix not set
GCW0_PREFIX = /opt/retrofw-toolchain/usr/bin/
endif
CC = $(GCW0_PREFIX)mipsel-linux-gcc
AR = $(GCW0_PREFIX)mipsel-linux-ar
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
CFLAGS += -fomit-frame-pointer -ffast-math -march=mips32 -mtune=mips32 -mhard-float -D__GCW0__
# clear_cache uses SYNCI instead of a syscall
CFLAGS += -DMIPS_USE_SYNCI
# MIYOO
else ifeq ($(platform), miyoo)
TARGET := $(TARGET_NAME)_libretro.so
CC = /opt/miyoo/usr/bin/arm-linux-gcc
AR = /opt/miyoo/usr/bin/arm-linux-ar
SHARED := -shared -nostdlib
fpic := -fPIC
LIBM :=
DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -fomit-frame-pointer -ffast-math -march=armv5te -mtune=arm926ej-s -D__GCW0__
HAVE_ARMv6 = 0
LOW_MEMORY = 1
# Windows MSVC 2017 all architectures
else ifneq (,$(findstring windows_msvc2017,$(platform)))
@ -527,7 +601,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc
CC ?= gcc
fpic := -fPIC
SHARED := -shared -static-libgcc -static-libstdc++
CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
@ -540,6 +614,10 @@ ifeq ($(USE_LIBRETRO_VFS),1)
CFLAGS += -DUSE_LIBRETRO_VFS
endif
ifeq ($(LOW_MEMORY), 1)
CFLAGS += -DLOW_MEMORY
endif
ifeq ($(NO_ARM_ASM),1)
use_cyclone = 0
use_fame = 1
@ -634,3 +712,7 @@ else
endif
include Makefile
ifeq ($(platform), osx)
pico/cd/libchdr/src/libchdr_chd.o: CFLAGS += -D__MACTYPES__=1
endif