Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-03-21 17:54:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #881 from Kurausukun/fix_makefile
Some checks failed
CI / build (push) Has been cancelled
Details

Browse Source 
Fix GBAFIX Usage in Makefile
This commit is contained in:
GriffinR 2025-06-23 19:06:46 -04:00 committed by GitHub
commit 16ae9a9f8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -221,11 +221,12 @@ tidy:
$(ROM): %.gba: %.elf
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
$(GBAFIX) $@ -p --silent
%.elf: $(LD_SCRIPT) $(ALL_OBJECTS)
@echo "cd $(BUILD_DIR) && $(LD) -T $(LD_SCRIPT:$(BUILD_DIR)/%=%) -Map ../../$(MAP) -o ../../$@ <objects> <lib>"
@cd $(BUILD_DIR) && $(LD) -T $(LD_SCRIPT:$(BUILD_DIR)/%=%) -Map ../../$(MAP) -o ../../$@ $(OBJS_REL) $(LDFLAGS)
$(GBAFIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent
$(GBAFIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent
$(LD_SCRIPT): $(LD_SCRIPT:$(BUILD_DIR)/%.ld=%.txt) $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_bss.ld
sed -e "s#tools/#../../tools/#g" $< >$@

1
tools/mapjson/json11.cpp
View File

@ -22,6 +22,7 @@
#include <cmath>
#include <cstdlib>
#include <cstdio>
#include <cstdint>
#include <limits>
namespace json11 {