diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-24 14:49:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 14:49:57 -0600 |
| commit | 0827945698fda77548abff87144e344cfbb4aa3b (patch) | |
| tree | 845639b20a44976fc89bbd89899b4ba055c022ca /Makefile | |
| parent | dcf79a29ba637713fb9e12512840654b2d5d09ac (diff) | |
| parent | dedc289914fc158ed4c064f763c7f0c72a759043 (diff) | |
Merge pull request #525 from pret/revert-524-master
Revert "Obsolete common_syms and rewrite sym files, to keep up with pokeruby"
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -172,8 +172,14 @@ $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< -$(OBJ_DIR)/sym_%.ld: sym_%.txt - $(CPP) -P $(CPPFLAGS) $< | sed -e "s#tools/#../../tools/#g" > $@ +$(OBJ_DIR)/sym_bss.ld: sym_bss.txt + $(RAMSCRGEN) .bss $< ENGLISH > $@ + +$(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) + $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ + +$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt + $(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld |