Merge branch 'master' into rename-tablecmds

1 files changed, 7 insertions, 11 deletions

diff --git a/build_tools.sh b/build_tools.sh
index b11a9a1b2..93f6065be 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -1,12 +1,8 @@
 #!/bin/sh
-make -C tools/gbagfx CXX=${1:-g++}
-make -C tools/scaninc CXX=${1:-g++}
-make -C tools/preproc CXX=${1:-g++}
-make -C tools/bin2c CXX=${1:-g++}
-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++}
-make -C tools/mapjson CXX=${1:-g++}
-make -C tools/jsonproc CXX=${1:-g++}
+
+echo "This script is deprecated. Next time, run \"make tools\" instead."
+for dname in tools/*; do
+  if [ -f ${dname}/Makefile ]; then
+    make -C ${dname} CXX=${1:-g++} --no-print-directory
+  fi
+done