Fix building and update build instructions

This commit is contained in:
PikalaxALT 2019-06-21 20:47:44 -04:00
parent 010db05e73
commit ba0fe59140
4 changed files with 5 additions and 2 deletions

View File

@ -26,7 +26,6 @@ To set up the repository:
make install-sdk prefix=../pokefirered
cd ../pokefirered
./build_tools.sh
To build **pokefirered.gba**:

View File

@ -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

View File

@ -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++}

View File

@ -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