From 4541b959b624e8298e9791d69dfac5630cd6a122 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 15 Aug 2019 15:17:13 -0400 Subject: [PATCH 1/2] Deprecate build_tools.sh --- build_tools.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/build_tools.sh b/build_tools.sh index b11a9a1b2..675207b96 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. Run \"make tools\" instead." +for dname in tools/*; do + if [[ -f ${dname}/Makefile ]]; then + make -C ${dname} CXX=${1:-g++} + fi +done From 40c1db11067a152865db10f2f5399354a4268c91 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Aug 2019 09:15:44 -0400 Subject: [PATCH 2/2] Update deprecated build_tools script --- build_tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools.sh b/build_tools.sh index 675207b96..93f6065be 100755 --- a/build_tools.sh +++ b/build_tools.sh @@ -1,8 +1,8 @@ #!/bin/sh -echo "This script is deprecated. Run \"make tools\" instead." +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++} + if [ -f ${dname}/Makefile ]; then + make -C ${dname} CXX=${1:-g++} --no-print-directory fi done