diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /build_tools.sh | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
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 d9eebf05c..429a9cef0 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -8,3 +8,4 @@ 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++} +make -C tools/mapjson CXX=${1:-g++} |