diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-30 15:28:31 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-05-08 17:06:39 -0500 |
| commit | 657068359dd654b59b12baf4ed5c5edf43fb8784 (patch) | |
| tree | 14ae2a225e987b038961d72be3601fbcb5110747 | |
| parent | 0babaa8c077f452695e7dc11071921eb92092580 (diff) | |
Better dependency handling for wild_encounters
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | json_data_rules.mk | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -156,7 +156,7 @@ ifeq ($(DINFO),1) override CFLAGS += -g 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 @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s @echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s diff --git a/json_data_rules.mk b/json_data_rules.mk index 5a5f2eeb3..2a3d2f17d 100755 --- a/json_data_rules.mk +++ b/json_data_rules.mk @@ -4,3 +4,5 @@ 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 $(JSONPROC) $^ $@ + +$(C_BUILDDIR)/wild_encounters.o: c_dep += $(DATA_SRC_SUBDIR)/wild_encounters.h |