diff --git a/Makefile b/Makefile index 77fb755e0..bf8c498ae 100644 --- a/Makefile +++ b/Makefile @@ -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