diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-05 10:47:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 10:47:39 -0400 |
| commit | 082093aa36ea82d7e7b8e6cf0c51aca17d73dd9b (patch) | |
| tree | 8c160abe15cc2cd9040e99677d29e2bab05d116b /Makefile | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
| parent | d4dc5c755a4c60d42c726c33c8fb77071052fe85 (diff) | |
Merge pull request #755 from garakmon/encounter_json
Wild Encounters to Json
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -26,6 +26,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) GBAFIX := tools/gbafix/gbafix$(EXE) MAPJSON := tools/mapjson/mapjson$(EXE) +JSONPROC := tools/jsonproc/jsonproc$(EXE) ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 --defsym DEBUG=$(DEBUG) CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm @@ -46,7 +47,8 @@ C_OBJECTS := $(addprefix $(BUILD_DIR)/, $(C_SOURCES:%.c=%.o)) ASM_OBJECTS := $(addprefix $(BUILD_DIR)/, $(ASM_SOURCES:%.s=%.o)) ALL_OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS) -SUBDIRS := $(sort $(dir $(ALL_OBJECTS))) +SUBDIRS := $(sort $(dir $(ALL_OBJECTS))) +DATA_SRC_SUBDIR = src/data LIBC := tools/agbcc/lib/libc.a LIBGCC := tools/agbcc/lib/libgcc.a @@ -102,6 +104,8 @@ MAKEFLAGS += --no-print-directory # Create build subdirectories $(shell mkdir -p $(SUBDIRS)) +AUTO_GEN_TARGETS := + all: $(ROM) ifeq ($(COMPARE),1) @$(SHA1SUM) $(BUILD_NAME).sha1 @@ -114,6 +118,7 @@ clean: tidy rm -f data/layouts/layouts.inc data/layouts/layouts_table.inc rm -f data/maps/connections.inc data/maps/events.inc data/maps/groups.inc data/maps/headers.inc find data/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + + rm -f $(AUTO_GEN_TARGETS) $(MAKE) clean -C tools/gbagfx $(MAKE) clean -C tools/scaninc $(MAKE) clean -C tools/preproc @@ -123,6 +128,7 @@ clean: tidy $(MAKE) clean -C tools/ramscrgen $(MAKE) clean -C tools/gbafix $(MAKE) clean -C tools/mapjson + $(MAKE) clean -C tools/jsonproc tools: @$(MAKE) -C tools/gbagfx @@ -135,6 +141,7 @@ tools: @$(MAKE) -C tools/mid2agb @$(MAKE) -C tools/gbafix @$(MAKE) -C tools/mapjson + @$(MAKE) -C tools/jsonproc tidy: $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) @@ -188,6 +195,7 @@ include misc.mk include spritesheet_rules.mk include override.mk include map_data_rules.mk +include json_data_rules.mk %.1bpp: %.png ; $(GBAGFX) $< $@ $(GFX_OPTS) %.4bpp: %.png ; $(GBAGFX) $< $@ $(GFX_OPTS) |