summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL.md2
-rw-r--r--Makefile20
2 files changed, 19 insertions, 3 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 7092d5a47..48ec407f7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -14,7 +14,6 @@ Then run the following commands.
./install.sh ../pokeruby
cd ../pokeruby
- ./build_tools.sh
To build **pokeruby.gba**:
@@ -48,7 +47,6 @@ In the **Cygwin terminal**, enter these commands:
./install.sh ../pokeruby
cd ../pokeruby
- ./build_tools.sh
To build **pokeruby.gba**:
diff --git a/Makefile b/Makefile
index 9e2a2366e..ddd1aa22c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,11 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld
#### Main Rules ####
+ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug
+
+# Available targets
+.PHONY: all clean tidy tools $(ALL_BUILDS)
+
# Disable dependency scanning when NODEP is used for quick building
ifeq ($(NODEP),)
$(BUILD_DIR)/src/%.o: C_FILE = $(*D)/$(*F).c
@@ -78,6 +83,11 @@ ifeq ($(NODEP),)
$(BUILD_DIR)/data/%.o: ASM_DEP = $(shell $(SCANINC) data/$(*F).s)
endif
+# Build tools when building the rom
+ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS)))
+$(info $(shell $(MAKE) tools))
+endif
+
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
# Clear the default suffixes
@@ -100,7 +110,15 @@ clean: tidy
$(RM) $(ALL_OBJECTS)
find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +
-ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug
+tools:
+ $(MAKE) -C tools/gbagfx
+ $(MAKE) -C tools/scaninc
+ $(MAKE) -C tools/preproc
+ $(MAKE) -C tools/bin2c
+ $(MAKE) -C tools/rsfont
+ $(MAKE) -C tools/aif2pcm
+ $(MAKE) -C tools/ramscrgen
+
tidy:
$(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map})
$(RM) -r build