diff options
| author | red031000 <rubenru09@aol.com> | 2020-06-27 17:52:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 17:52:35 +0100 |
| commit | c202e7568c660ce16853f6f21720240615b692f4 (patch) | |
| tree | 0e6f9932e67d56a8d2342ee11f74e0ce1e6e44d7 /filesystem.mk | |
| parent | 981bf953cbf711eca70d31ccec297ac38501ffd8 (diff) | |
| parent | 51afc1756ecf096739b2b75806ed738bd7d56b18 (diff) | |
Merge pull request #191 from PikalaxALT/pikalax_work
Sound and script cleanup; fixrom + makerom
Diffstat (limited to 'filesystem.mk')
| -rw-r--r-- | filesystem.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/filesystem.mk b/filesystem.mk index 05098980..9737436b 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -269,10 +269,10 @@ NITROFS_FILES := data/UTF16.dat \ dwc/utility.bin ifeq ($(GAME_VERSION),PEARL) -NITROFS_FILES = $(NITROFS_FILES:poketool/personal/personal.narc=poketool/personal_pearl/personal.narc) +NITROFS_FILES := $(NITROFS_FILES:poketool/personal/personal.narc=poketool/personal_pearl/personal.narc) endif -HOSTFS_FILES = $(NITROFS_FILES:%=files/%) +HOSTFS_FILES := $(NITROFS_FILES:%=files/%) %.narc: $(KNARC) -d $(basename $@)/ -p $@ @@ -289,8 +289,14 @@ O2NARC_TARGETS := \ files/poketool/personal/pms.narc: O2NARCFLAGS = -f -$(O2NARC_TARGETS): %.narc: %.json %.json.txt - $(JSONPROC) $^ $*.c +ifeq (,$(NODEP)) +$(O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@)) +else +$(O2NARC_TARGETS): dep := +endif + +$(O2NARC_TARGETS): %.narc: %.json %.json.txt $$(dep) + $(JSONPROC) $*.json $*.json.txt $*.c $(CC) $(CFLAGS) -c -o $*.o $*.c $(O2NARC) $(O2NARCFLAGS) $*.o $@ @$(RM) $*.o $*.c |