Fix dependency on lib/include/nitro/fx/fx_const.h

This commit is contained in:
PikalaxALT 2022-01-10 20:55:41 -05:00
parent 7d27a220a7
commit fb1198ccfc
3 changed files with 6 additions and 3 deletions

View File

@ -81,7 +81,8 @@ FX_CONST_H := $(WORK_DIR)/lib/include/nitro/fx/fx_const.h
$(FX_CONST_H):
$(MKFXCONST) >$@
PROJECT_CLEAN_TARGETS += $(FX_CONST_H)
$(WORK_DIR)/include/global.h: $(FX_CONST_H)
$(WORK_DIR)/include/global.h: $(FX_CONST_H) ;
.PHONY: $(FX_CONST_H)
heartgold: ; @$(MAKE) GAME_VERSION=HEARTGOLD
soulsilver: ; @$(MAKE) GAME_VERSION=SOULSILVER

View File

@ -8,7 +8,7 @@ TRNAME_TEMPLATE := files/poketool/trainer/trname.json.txt
$(TRDATA_NARC): %.narc: $(TRAINER_JSON) $(TRDATA_TEMPLATE)
$(JSONPROC) $^ $*.c
$(WINE) $(MWCC) $(MWCFLAGS) -include global.h -c -o $*.o $*.c
$(WINE) $(MWCC) $(MWCFLAGS) -c -o $*.o $*.c
$(O2NARC) $*.o $@ -n
@$(RM) $*.o $*.c
@ -22,4 +22,7 @@ $(TRNAME_GMM): $(TRAINER_JSON) $(TRNAME_TEMPLATE)
$(JSONPROC) $^ $@
$(SED) -i 's/&/&/g' $@
$(TRDATA_NARC): MWCFLAGS += -include global.h
$(TRAINER_JSON): | $(WORK_DIR)/include/global.h
FS_CLEAN_TARGETS += $(TRNAME_GMM) $(TRDATA_NARC) $(TRPOKE_NARC)

View File

@ -100,7 +100,6 @@ Static main
Object apricorn_tree_sys.o
Object unk_0202AE8C.o
Object unk_0202AEC0.o
Object unk_0202AEC0.o
Object mail.o
Object unk_0202B614.o
Object unk_0202C034.o