From a093268fc3e04150d09fe64dbc42744c1a0d1793 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Wed, 19 Feb 2020 20:24:13 -0800 Subject: [PATCH] Cleaning up build scripts --- bin/{build.sh => build-linux.sh} | 5 +---- bin/build-mac.sh | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) rename bin/{build.sh => build-linux.sh} (83%) mode change 100755 => 100644 diff --git a/bin/build.sh b/bin/build-linux.sh old mode 100755 new mode 100644 similarity index 83% rename from bin/build.sh rename to bin/build-linux.sh index 0d01ab2d..ff944b59 --- a/bin/build.sh +++ b/bin/build-linux.sh @@ -4,6 +4,7 @@ set -e # Set up directories (mirrors build.bat) + ME="$(readlink -f "$0")" LOCATION="$(dirname "$ME")" SRC_ROOT="$(dirname "$LOCATION")" @@ -26,11 +27,7 @@ fi chmod +rx "$BIN_ROOT/detect_os.sh" os=$("$BIN_ROOT/detect_os.sh") -if [[ "$os" == "linux" ]]; then WARNINGS="-Wno-write-strings -Wno-comment" -elif [[ "$os" == "mac" ]]; then -WARNINGS="-Wno-write-strings -Wno-comment -Wno-logical-op-parentheses -Wno-null-dereference -Wno-switch" -fi FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" INCLUDES="-I$SRC_ROOT -I$CUSTOM_ROOT" diff --git a/bin/build-mac.sh b/bin/build-mac.sh index 83062702..01fb3286 100755 --- a/bin/build-mac.sh +++ b/bin/build-mac.sh @@ -27,11 +27,7 @@ fi chmod +rx "$BIN_ROOT/detect_os.sh" os=$("$BIN_ROOT/detect_os.sh") -if [[ "$os" == "linux" ]]; then -WARNINGS="-Wno-write-strings -Wno-comment" -elif [[ "$os" == "mac" ]]; then WARNINGS="-Wno-write-strings -Wno-comment -Wno-null-dereference -Wno-logical-op-parentheses -Wno-switch" -fi FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" INCLUDES="-I$SRC_ROOT -I$CUSTOM_ROOT"