summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-06-21 13:12:56 -0400
committerGitHub <noreply@github.com>2019-06-21 13:12:56 -0400
commit010db05e735e0ac11efcf0d800205324cc0f2be9 (patch)
tree9109eaf029ee3253a554e50df5584d540ff243f8 /Makefile
parentcaa193364bf786cb567ed16eb4670ed2cc4cb362 (diff)
parent3444ac708a0dfc9e99c34a3c19159e786d8ab9f1 (diff)
Merge pull request #71 from pret/item_use
item_use and item
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a5de0f9da..5d01ba6b9 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen
FIX := tools/gbafix/gbafix
MAPJSON := tools/mapjson/mapjson
+JSONPROC := tools/jsonproc/jsonproc
# Clear the default suffixes
.SUFFIXES:
@@ -103,6 +104,7 @@ tools:
@$(MAKE) -C tools/mid2agb
@$(MAKE) -C tools/gbafix
@$(MAKE) -C tools/mapjson
+ @$(MAKE) -C tools/jsonproc
# For contributors to make sure a change didn't affect the contents of the ROM.
compare: rom
@@ -126,6 +128,7 @@ clean: tidy
@$(MAKE) clean -C tools/mid2agb
@$(MAKE) clean -C tools/gbafix
@$(MAKE) clean -C tools/mapjson
+ @$(MAKE) clean -C tools/jsonproc
tidy:
rm -f $(ROM) $(ELF) $(MAP)
@@ -135,6 +138,7 @@ tidy:
include graphics_file_rules.mk
include tileset_rules.mk
include map_data_rules.mk
+include json_data_rules.mk
%.s: ;
%.png: ;