summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-04-30 05:57:45 -0700
committerYamaArashi <shadow962@live.com>2016-04-30 05:57:45 -0700
commitc78ee2e488251f4e13ad92b746da8b8875f51ab5 (patch)
tree58d535b6d1fba9d169f8b4a1af482730ee3b9037
parentcc210e57a699878b928ff1711ae9edd900ac4433 (diff)
use shell script to build tools
-rw-r--r--INSTALL.md2
-rw-r--r--Makefile13
-rw-r--r--build.bat4
-rw-r--r--build_tools.sh4
4 files changed, 6 insertions, 17 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 796cd9eac..7f69a8948 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -13,7 +13,7 @@ Then get the compiler from https://github.com/YamaArashi/agbcc and run the follo
Then in the pokeruby directory, build the tools.
- make tools
+ build_tools.sh
Finally, build the rom.
diff --git a/Makefile b/Makefile
index 0c6154126..67b2ec720 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ PREPROC := tools/preproc/preproc
.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz
-.PHONY: rom tools gbagfx scaninc preproc clean compare
+.PHONY: rom clean compare
C_SRCS := $(wildcard src/*.c)
C_OBJS := $(C_SRCS:%.c=%.o)
@@ -47,17 +47,6 @@ ELF := $(ROM:.gba=.elf)
rom: $(ROM)
-tools: gbagfx scaninc preproc
-
-gbagfx:
- cd tools/gbagfx && make
-
-scaninc:
- cd tools/scaninc && make
-
-preproc:
- cd tools/preproc && make
-
# For contributors to make sure a change didn't affect the contents of the ROM.
compare: $(ROM)
@$(SHA1) rom.sha1
diff --git a/build.bat b/build.bat
deleted file mode 100644
index d59a88aec..000000000
--- a/build.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-as -mcpu=arm7tdmi asm/rom.s -o rom.o
-ld -T ld_script.txt -T iwram_syms.txt -T ewram_syms.txt -o pokeruby.elf rom.o
-objcopy -O binary pokeruby.elf pokeruby.gba
-diff baserom.gba pokeruby.gba
diff --git a/build_tools.sh b/build_tools.sh
new file mode 100644
index 000000000..b5e28697f
--- /dev/null
+++ b/build_tools.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+make -C tools/gbagfx
+make -C tools/scaninc
+make -C tools/preproc