git.y1.nz

commit 288bd84d1909afd9585c2118358e9e70b707e4fb
parent 1247d00cbbd15b88f6274e983b3e6e8b7479b157
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Fri, 30 Dec 2022 18:04:57 +0200

Make libretro's build respect BOOTROMS_DIR

Diffstat:
M
Makefile
2
+-
M
libretro/Makefile
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
@@ -491,7 +491,7 @@ $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12
 
 # Libretro Core (uses its own build system)
 libretro:
-	CFLAGS="$(WARNINGS)" $(MAKE) -C libretro
+	CFLAGS="$(WARNINGS)" $(MAKE) -C libretro BOOTROMS_DIR=$(abspath $(BOOTROMS_DIR))
 
 # install for Linux/FreeDesktop/etc.
 # Does not install mimetype icons because FreeDesktop is cursed abomination with no right to exist.
diff --git a/libretro/Makefile b/libretro/Makefile
@@ -49,7 +49,7 @@ ifeq ($(platform), win)
 	INCFLAGS += -I Windows
 endif
 
-CORE_DIR     = ../
+CORE_DIR     = ..
 
 TARGET_NAME  = sameboy
 LIBM		    = -lm
@@ -335,7 +335,7 @@ CFLAGS   += -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_M
 
 all: $(TARGET)
 
-$(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/build/bin/BootROMs/%_boot.bin
+$(CORE_DIR)/libretro/%_boot.c: $(BOOTROMS_DIR)/%_boot.bin
 	echo "/* AUTO-GENERATED */" > $@
 	echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@
 ifneq ($(findstring Haiku,$(shell uname -s)),)
@@ -348,8 +348,8 @@ endif
 	echo "};" >> $@
 	echo "const unsigned $(notdir $(@:%.c=%))_length = sizeof($(notdir $(@:%.c=%)));" >> $@
 
-$(CORE_DIR)/build/bin/BootROMs/%_boot.bin:
-	$(MAKE) -C $(CORE_DIR) $(patsubst $(CORE_DIR)/%,%,$@)
+$(abspath $(CORE_DIR))/build/bin/BootROMs/%_boot.bin:
+	$(MAKE) -C $(CORE_DIR) $(patsubst $(abspath $(CORE_DIR))/%,%,$@)
 
 $(TARGET): $(OBJECTS)
 	-@$(MKDIR) -p $(dir $@)

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.