diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /build_tools.sh | |
parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'build_tools.sh')
-rwxr-xr-x | build_tools.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_tools.sh b/build_tools.sh index ad8adf132..d9eebf05c 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -7,3 +7,4 @@ make -C tools/rsfont CXX=${1:-g++} make -C tools/aif2pcm CXX=${1:-g++} make -C tools/ramscrgen CXX=${1:-g++} make -C tools/gbafix CXX=${1:-g++} +make -C tools/mid2agb CXX=${1:-g++} |