funkey/picodrive-irixxxx
1
0
Fork 0
mirror of https://github.com/FunKey-Project/picodrive-irixxxx.git synced 2026-05-05 12:23:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #126 from hizzlekizzle/master

Browse Source 
More buildfixes from irixxxx
This commit is contained in:
hizzlekizzle
2020-07-11 17:05:04 -05:00
committed by GitHub
parent cffabdbbc0 3ff18539e3
commit 7233f69fcb
7 changed files with 114 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@@ -69,27 +69,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 x86% i386% mips% aarch% riscv% powerpc% ppc%, $(ARCH)))
use_sh2drc ?= 1 use_sh2drc ?= 1
endif endif
endif
-include Makefile.local -include Makefile.local
@@ -240,7 +226,7 @@ LDFLAGS += -Wl,-Map=$(TARGET).map
endif endif
endif endif
target_: pico/pico_int_offs.h $(TARGET) target_: $(TARGET)
clean: clean:
$(RM) $(TARGET) $(OBJS) pico/pico_int_offs.h $(RM) $(TARGET) $(OBJS) pico/pico_int_offs.h

307
Makefile.libretro
View File

@@ -15,10 +15,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
@@ -46,15 +42,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)
@@ -69,7 +56,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
ifneq ($(findstring SunOS,$(shell uname -a)),) ifneq ($(findstring SunOS,$(shell uname -a)),)
CC=gcc CC=gcc
endif endif
@@ -83,7 +69,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)
@@ -92,15 +77,9 @@ 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
CFLAGS += -DHAVE_NO_LANGEXTRA CFLAGS += -DHAVE_NO_LANGEXTRA
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"`
@@ -122,15 +101,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)))
@@ -148,10 +120,11 @@ else ifneq (,$(findstring ios,$(platform)))
else else
CC = clang -arch armv7 -isysroot $(IOSSDK) CC = clang -arch armv7 -isysroot $(IOSSDK)
CXX = clang++ -arch armv7 -isysroot $(IOSSDK) CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
NO_ARM_ASM = 1
endif endif
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
CFLAGS += -DIOS CFLAGS += -DIOS
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64)) ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
@@ -159,32 +132,16 @@ ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
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
else else
CC += -miphoneos-version-min=5.0 CC += -miphoneos-version-min=5.0
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
ARCH := arm
endif
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
use_svpdrc = 0 use_svpdrc = 0
endif
# tvOS # tvOS
else ifeq ($(platform), tvos-arm64) else ifeq ($(platform), tvos-arm64)
ARCH := aarch64
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
use_svpdrc = 0
TARGET := $(TARGET_NAME)_libretro_tvos.dylib TARGET := $(TARGET_NAME)_libretro_tvos.dylib
SHARED := -dynamiclib SHARED := -dynamiclib
fpic := -fPIC fpic := -fPIC
@@ -208,14 +165,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
@@ -224,12 +176,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
@@ -240,94 +186,60 @@ 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_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
# PS2 # PS2
else ifeq ($(platform), ps2) else ifeq ($(platform), ps2)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = ee-gcc$(EXE_EXT) CC = ee-gcc$(EXE_EXT)
AR = ee-ar$(EXE_EXT) AR = ee-ar$(EXE_EXT)
CFLAGS += -Wall -DPS2 -DUSE_BGR555 -DFAMEC_NO_GOTOS -DRENDER_GSKIT_PS2 -fsingle-precision-constant CFLAGS += -Wall -DPS2 -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 += -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include
CFLAGS += -DHAVE_NO_LANGEXTRA CFLAGS += -DHAVE_NO_LANGEXTRA
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
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
use_sh2drc = 1
asm_render = 1
OBJS += platform/ps2/asm.o OBJS += platform/ps2/asm.o
# 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)
@@ -342,15 +254,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)
@@ -380,7 +283,7 @@ else ifeq ($(platform), wiiu)
CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
COMMONFLAGS += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__POWERPC__ -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -I./deps/include/ COMMONFLAGS += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__POWERPC__ -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 -I./deps/include/
COMMONFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int COMMONFLAGS += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
# Nintendo Switch (libtransistor) # Nintendo Switch (libtransistor)
else ifeq ($(platform), switch) else ifeq ($(platform), switch)
@@ -388,20 +291,17 @@ else ifeq ($(platform), switch)
include $(LIBTRANSISTOR_HOME)/libtransistor.mk include $(LIBTRANSISTOR_HOME)/libtransistor.mk
STATIC_LINKING=1 STATIC_LINKING=1
NO_MMAP = 1 NO_MMAP = 1
ARCH = aarch64
# Nintendo Switch (libnx) # Nintendo Switch (libnx)
else ifeq ($(platform), libnx) else ifeq ($(platform), libnx)
include $(DEVKITPRO)/libnx/switch_rules include $(DEVKITPRO)/libnx/switch_rules
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
ARCH := aarch64 CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition
CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs
CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs CFLAGS += -D__SWITCH__ -DHAVE_LIBNX
CFLAGS += -D__SWITCH__ -DHAVE_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 += -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
CFLAGS += -Ifrontend/switch -ftree-vectorize STATIC_LINKING=1
STATIC_LINKING=1
use_sh2drc = 1
# QNX # QNX
else ifeq ($(platform), qnx) else ifeq ($(platform), qnx)
@@ -412,15 +312,7 @@ 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
# (armv7 a7, hard point, neon based) ### # (armv7 a7, hard point, neon based) ###
# NESC, SNESC, C64 mini # NESC, SNESC, C64 mini
else ifeq ($(platform), classic_armv7_a7) else ifeq ($(platform), classic_armv7_a7)
@@ -439,7 +331,6 @@ else ifeq ($(platform), classic_armv7_a7)
CPPFLAGS += $(CFLAGS) CPPFLAGS += $(CFLAGS)
ASFLAGS += $(CFLAGS) ASFLAGS += $(CFLAGS)
HAVE_NEON = 1 HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon BUILTIN_GPU = neon
ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1) ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
CFLAGS += -march=armv7-a CFLAGS += -march=armv7-a
@@ -451,43 +342,35 @@ else ifeq ($(platform), classic_armv7_a7)
endif endif
endif endif
use_sh2drc = 1
use_svpdrc = 1
# (armv8 a35, hard point, neon based) ### # (armv8 a35, hard point, neon based) ###
# Playstation Classic # Playstation Classic
else ifeq ($(platform), classic_armv8_a35) else ifeq ($(platform), classic_armv8_a35)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC fpic := -fPIC
SHARED := -shared -Wl,--no-undefined,-Bsymbolic SHARED := -shared -Wl,--no-undefined,-Bsymbolic
CFLAGS += -Ofast \ CFLAGS += -Ofast \
-flto -fwhole-program -fuse-linker-plugin \ -flto -fwhole-program -fuse-linker-plugin \
-fdata-sections -ffunction-sections -Wl,--gc-sections \ -fdata-sections -ffunction-sections -Wl,--gc-sections \
-fno-stack-protector -fno-ident -fomit-frame-pointer \ -fno-stack-protector -fno-ident -fomit-frame-pointer \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \ -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \ -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
-fmerge-all-constants -fno-math-errno -fno-strict-aliasing \ -fmerge-all-constants -fno-math-errno -fno-strict-aliasing \
-marm -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard -marm -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
CXXFLAGS += $(CFLAGS) CXXFLAGS += $(CFLAGS)
CPPFLAGS += $(CFLAGS) CPPFLAGS += $(CFLAGS)
ASFLAGS += $(CFLAGS) ASFLAGS += $(CFLAGS)
HAVE_NEON = 1 HAVE_NEON = 1
ARCH = aarch64 BUILTIN_GPU = neon
BUILTIN_GPU = neon CFLAGS += -march=armv8-a
CFLAGS += -march=armv8-a LDFLAGS += -static-libgcc -static-libstdc++
LDFLAGS += -static-libgcc -static-libstdc++
use_sh2drc = 1
use_cyclone = 0
use_fame = 1
use_drz80 = 0
use_cz80 = 1
####################################### #######################################
# ARM-64 # ARM-64
else ifeq ($(platform), arm64) else ifeq ($(platform), arm64)
EXT ?= so EXT ?= so
TARGET := $(TARGET_NAME)_libretro.$(EXT) TARGET := $(TARGET_NAME)_libretro.$(EXT)
ARCH = aarch64
fpic := -fPIC fpic := -fPIC
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
@@ -497,7 +380,7 @@ else ifeq ($(platform), arm64)
else ifeq ($(platform), aarch64) else ifeq ($(platform), aarch64)
TARGET := $(TARGET_NAME)_libretro.so TARGET := $(TARGET_NAME)_libretro.so
ARCH = aarch64 ARCH = aarch64
fpic := -fPIC fpic := -fPIC
SHARED := -shared SHARED := -shared
DONT_COMPILE_IN_ZLIB = 1 DONT_COMPILE_IN_ZLIB = 1
CFLAGS += -DFAMEC_NO_GOTOS CFLAGS += -DFAMEC_NO_GOTOS
@@ -533,40 +416,30 @@ 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
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
CC = mipsel-linux-gcc CC = mipsel-linux-gcc
AR = mipsel-linux-ar AR = mipsel-linux-ar
SHARED := -shared -nostdlib SHARED := -shared -nostdlib
fpic := -fPIC fpic := -fPIC
LIBM := LIBM :=
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 MSVC 2017 all architectures # Windows MSVC 2017 all architectures
else ifneq (,$(findstring windows_msvc2017,$(platform))) else ifneq (,$(findstring windows_msvc2017,$(platform)))
NO_GCC := 1 NO_GCC := 1
PlatformSuffix = $(subst windows_msvc2017_,,$(platform)) PlatformSuffix = $(subst windows_msvc2017_,,$(platform))
ifneq (,$(findstring desktop,$(PlatformSuffix))) ifneq (,$(findstring desktop,$(PlatformSuffix)))
@@ -581,6 +454,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
LDLIBS += WindowsApp.lib LDLIBS += WindowsApp.lib
endif endif
ARCH = x86_64
SHARED := SHARED :=
LIBM := LIBM :=
USE_LIBRETRO_VFS = 1 USE_LIBRETRO_VFS = 1
@@ -654,7 +528,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
ifneq (,$(findstring uwp,$(PlatformSuffix))) ifneq (,$(findstring uwp,$(PlatformSuffix)))
LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store") LIB := $(shell IFS=$$'\n'; cygpath -w "$(LIB)/store")
endif endif
export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir) export INCLUDE := $(INCLUDE);$(WindowsSDKSharedIncludeDir);$(WindowsSDKUCRTIncludeDir);$(WindowsSDKUMIncludeDir)
export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir) export LIB := $(LIB);$(WindowsSDKUCRTLibDir);$(WindowsSDKUMLibDir)
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
@@ -663,7 +537,6 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
# Windows # Windows
else else
use_sh2drc = 1
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc CC = gcc
fpic := -fPIC fpic := -fPIC
@@ -683,15 +556,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)
@@ -700,11 +578,10 @@ ifeq ($(findstring Haiku,$(shell uname -a)),)
LDLIBS += $(LIBM) LDLIBS += $(LIBM)
endif 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

14
pico/pico_int.h
View File

@@ -33,12 +33,14 @@ extern "C" {
#endif #endif
typedef unsigned char u8; #ifndef UTYPES_DEFINED
typedef signed char s8; typedef uint8_t u8;
typedef unsigned short u16; typedef int8_t s8;
typedef signed short s16; typedef uint16_t u16;
typedef unsigned int u32; typedef int16_t s16;
typedef signed int s32; typedef uint32_t u32;
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)