Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better dependency handling for wild_encounters

This commit is contained in:
PikalaxALT 2019-04-30 15:28:31 -04:00 committed by huderlem
parent 0babaa8c07
commit 657068359d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -156,7 +156,7 @@ ifeq ($(DINFO),1)
override CFLAGS += -g override CFLAGS += -g
endif endif
$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) $(AUTO_GEN_TARGETS) $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s @echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s

2
json_data_rules.mk
View File

@ -4,3 +4,5 @@
AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/wild_encounters.h AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/wild_encounters.h
$(DATA_SRC_SUBDIR)/wild_encounters.h: $(DATA_SRC_SUBDIR)/wild_encounters.json $(DATA_SRC_SUBDIR)/wild_encounters.json.txt $(DATA_SRC_SUBDIR)/wild_encounters.h: $(DATA_SRC_SUBDIR)/wild_encounters.json $(DATA_SRC_SUBDIR)/wild_encounters.json.txt
$(JSONPROC) $^ $@ $(JSONPROC) $^ $@
$(C_BUILDDIR)/wild_encounters.o: c_dep += $(DATA_SRC_SUBDIR)/wild_encounters.h