From 57f7d41ddf9c5d0edfbf9e256609586f0c744479 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Wed, 19 Feb 2020 20:47:29 -0800 Subject: [PATCH] Foo bar blah lbha --- bin/build-linux.sh | 7 ++----- bin/build-mac.sh | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bin/build-linux.sh b/bin/build-linux.sh index ff944b59..3099577d 100644 --- a/bin/build-linux.sh +++ b/bin/build-linux.sh @@ -3,7 +3,7 @@ # If any command errors, stop the script set -e -# Set up directories (mirrors build.bat) +# Set up directories ME="$(readlink -f "$0")" LOCATION="$(dirname "$ME")" @@ -23,16 +23,13 @@ if [ -z "$BUILD_MODE" ]; then BUILD_MODE="-DDEV_BUILD" fi -# Get the OS specific flags -chmod +rx "$BIN_ROOT/detect_os.sh" -os=$("$BIN_ROOT/detect_os.sh") - WARNINGS="-Wno-write-strings -Wno-comment" FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" INCLUDES="-I$SRC_ROOT -I$CUSTOM_ROOT" # Execute +echo g++ $WARNINGS $FLAGS $INCLUDES "$BIN_ROOT/4ed_build.cpp" -g -o "$BUILD_ROOT/build" g++ $WARNINGS $FLAGS $INCLUDES "$BIN_ROOT/4ed_build.cpp" -g -o "$BUILD_ROOT/build" pushd "$SRC_ROOT" "$BUILD_ROOT/build" diff --git a/bin/build-mac.sh b/bin/build-mac.sh index 01fb3286..adae8015 100755 --- a/bin/build-mac.sh +++ b/bin/build-mac.sh @@ -3,7 +3,7 @@ # If any command errors, stop the script set -e -# Set up directories (mirrors build.bat) +# Set up directories # NOTE(yuval): Replaced readlink with realpath which works for both macOS and Linux ME="$(realpath "$0")" LOCATION="$(dirname "$ME")" @@ -23,10 +23,6 @@ if [ -z "$BUILD_MODE" ]; then BUILD_MODE="-DDEV_BUILD" fi -# Get the OS specific flags -chmod +rx "$BIN_ROOT/detect_os.sh" -os=$("$BIN_ROOT/detect_os.sh") - WARNINGS="-Wno-write-strings -Wno-comment -Wno-null-dereference -Wno-logical-op-parentheses -Wno-switch" FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE"