ShuriZma
/
SameBoy
mirror of https://github.com/LIJI32/SameBoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various libretro buildbot fixes

This commit is contained in:
Lior Halphon 2024-03-09 03:22:40 +02:00
parent 6eedee78db
commit 2d29ece3b8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretro/Makefile
View File

@ -188,7 +188,7 @@ endif
DEFINES := -DIOS
ifeq ($(platform),ios-arm64)
CC = cc -arch armv64 -isysroot $(IOSSDK)
CC = cc -arch arm64 -isysroot $(IOSSDK)
else
CC = cc -arch armv7 -isysroot $(IOSSDK)
endif
@ -326,7 +326,12 @@ else
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--no-undefined
endif
ifeq ($(STATIC_LINKING), 1)
# For some reason libretro's buildbot expects the output to be at ./libretro/ for static targets
BIN ?= $(realpath -m $(CORE_DIR)/libretro)
else
BIN ?= $(realpath -m $(CORE_DIR))
endif
override BIN := $(shell cd .. && realpath -m $(BIN))
TARGET := $(BIN)/$(TARGET)

4
libretro/jni/Android.mk
View File

@ -22,7 +22,9 @@ LOCAL_CFLAGS := -std=c99 $(COREFLAGS) $(CFLAGS)
LOCAL_LDFLAGS := -Wl,-version-script=$(CORE_DIR)/libretro/link.T
include $(BUILD_SHARED_LIBRARY)
$(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/build/bin/BootROMs/%_boot.bin
override BOOTROMS_DIR := $(shell cd ../.. && realpath -m $(BOOTROMS_DIR))
$(CORE_DIR)/libretro/%_boot.c: $(BOOTROMS_DIR)/%_boot.bin
echo "/* AUTO-GENERATED */" > $@
echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@
hexdump -v -e '/1 "0x%02x, "' $< >> $@