Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved libretro’s Makefile to libretro’s folder

Browse Source
This commit is contained in:
Lior Halphon 2017-10-12 22:40:48 +03:00
parent 49095ebc5e
commit a498b19bfd
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -91,7 +91,7 @@ quicklook: $(BIN)/SameBoy.qlgenerator
sdl: $(SDL_TARGET) $(BIN)/SDL/dmg_boot.bin $(BIN)/SDL/cgb_boot.bin $(BIN)/SDL/LICENSE $(BIN)/SDL/registers.sym $(BIN)/SDL/drop.bmp sdl: $(SDL_TARGET) $(BIN)/SDL/dmg_boot.bin $(BIN)/SDL/cgb_boot.bin $(BIN)/SDL/LICENSE $(BIN)/SDL/registers.sym $(BIN)/SDL/drop.bmp
bootroms: $(BIN)/BootROMs/cgb_boot.bin $(BIN)/BootROMs/dmg_boot.bin bootroms: $(BIN)/BootROMs/cgb_boot.bin $(BIN)/BootROMs/dmg_boot.bin
tester: $(TESTER_TARGET) $(BIN)/tester/dmg_boot.bin $(BIN)/tester/cgb_boot.bin tester: $(TESTER_TARGET) $(BIN)/tester/dmg_boot.bin $(BIN)/tester/cgb_boot.bin
all: cocoa sdl tester all: cocoa sdl tester libretro
# Get a list of our source files and their respective object file targets # Get a list of our source files and their respective object file targets
@ -279,7 +279,12 @@ $(BIN)/BootROMs/%.bin: BootROMs/%.asm
head -c $(if $(findstring dmg,$@), 256, 2304) $@.tmp2 > $@ head -c $(if $(findstring dmg,$@), 256, 2304) $@.tmp2 > $@
@rm $@.tmp $@.tmp2 @rm $@.tmp $@.tmp2
# Libretro Core (uses its own build system)
libretro:
make -C libretro
# Clean # Clean
clean: clean:
rm -rf build rm -rf build
.PHONY: libretro

10
Makefile.libretro → libretro/Makefile
View File

@ -33,7 +33,7 @@ ifeq ($(platform), win)
INCFLAGS += -I Windows INCFLAGS += -I Windows
endif endif
CORE_DIR += . CORE_DIR += ..
TARGET_NAME = sameboy TARGET_NAME = sameboy
LIBM = -lm LIBM = -lm
@ -113,7 +113,7 @@ else
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--no-undefined SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--no-undefined
endif endif
TARGET := build/bin/libretro/$(TARGET) TARGET := $(CORE_DIR)/build/bin/$(TARGET)
# To force use of the Unix version instead of the Windows version # To force use of the Unix version instead of the Windows version
MKDIR := $(shell which mkdir) MKDIR := $(shell which mkdir)
@ -128,7 +128,7 @@ endif
include Makefile.common include Makefile.common
OBJECTS := $(patsubst %.c,build/obj/%_libretro.c.o,$(SOURCES_C)) OBJECTS := $(patsubst %.c,$(CORE_DIR)/build/obj/%_libretro.c.o,$(SOURCES_C))
CFLAGS += -Wall -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES CFLAGS += -Wall -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES
CXXFLAGS += -Wall -D__LIBRETRO__ $(fpic) CXXFLAGS += -Wall -D__LIBRETRO__ $(fpic)
@ -143,7 +143,7 @@ $(CORE_DIR)/libretro/%_boot.c: $(CORE_DIR)/build/bin/BootROMs/%_boot.bin
echo "const unsigned $(notdir $(@:%.c=%))_length = sizeof($(notdir $(@:%.c=%)));" >> $@ echo "const unsigned $(notdir $(@:%.c=%))_length = sizeof($(notdir $(@:%.c=%)));" >> $@
$(CORE_DIR)/build/bin/BootROMs/%_boot.bin: $(CORE_DIR)/build/bin/BootROMs/%_boot.bin:
make -C $(CORE_DIR) $@ make -C $(CORE_DIR) $(patsubst $(CORE_DIR)/%,%,$@)
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
@ -153,7 +153,7 @@ else
$(CC) $(fpic) $(SHARED) $(INCFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) $(CC) $(fpic) $(SHARED) $(INCFLAGS) -o $@ $(OBJECTS) $(LDFLAGS)
endif endif
build/obj/%_libretro.c.o: %.c $(CORE_DIR)/build/obj/%_libretro.c.o: %.c
-@$(MKDIR) -p $(dir $@) -@$(MKDIR) -p $(dir $@)
$(CC) -c -o $@ $< $(CFLAGS) $(fpic) -DGB_INTERNAL $(CC) -c -o $@ $< $(CFLAGS) $(fpic) -DGB_INTERNAL

0
Makefile.common → libretro/Makefile.common
View File