diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-21 20:47:44 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-21 20:47:44 -0400 |
| commit | ba0fe59140dfe76c77e60746396326115a9c460e (patch) | |
| tree | 5fe9b6d72f9a4b3d7c9c1bbe78904780b9ae7d30 | |
| parent | 010db05e735e0ac11efcf0d800205324cc0f2be9 (diff) | |
Fix building and update build instructions
| -rw-r--r-- | INSTALL.md | 1 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | build_tools.sh | 1 | ||||
| -rw-r--r-- | json_data_rules.mk | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/INSTALL.md b/INSTALL.md index fc08af81b..31f136c76 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,7 +26,6 @@ To set up the repository: make install-sdk prefix=../pokefirered cd ../pokefirered - ./build_tools.sh To build **pokefirered.gba**: @@ -89,6 +89,8 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) MAKEFLAGS += --no-print-directory +AUTO_GEN_TARGETS := + all: rom rom: $(ROM) @@ -117,6 +119,7 @@ clean: tidy rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + + rm -f $(AUTO_GEN_TARGETS) @$(MAKE) clean -C berry_fix @$(MAKE) clean -C tools/gbagfx @$(MAKE) clean -C tools/scaninc diff --git a/build_tools.sh b/build_tools.sh index 212df96e7..f64b01573 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -8,3 +8,4 @@ make -C tools/ramscrgen CXX=${1:-g++} make -C tools/rsfont CXX=${1:-g++} make -C tools/scaninc CXX=${1:-g++} make -C tools/mapjson CXX=${1:-g++} +make -C tools/jsonproc CXX=${1:-g++} diff --git a/json_data_rules.mk b/json_data_rules.mk index 1c731078a..980e63e88 100644 --- a/json_data_rules.mk +++ b/json_data_rules.mk @@ -6,4 +6,4 @@ AUTO_GEN_TARGETS += src/data/items.h src/data/items.h: src/data/items.json src/data/items.json.txt $(JSONPROC) $^ $@ -$(BUILD_DIR)/src/item.o: C_DEP += src/data/items.h +$(C_BUILDDIR)/item.o: c_dep += src/data/items.h |