ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Foo bar blah lbha

This commit is contained in:
Allen Webster 2020-02-19 20:47:29 -08:00
parent 54aa02f0f4
commit 57f7d41ddf
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/build-linux.sh
View File

@ -3,7 +3,7 @@
# If any command errors, stop the script # If any command errors, stop the script
set -e set -e
# Set up directories (mirrors build.bat) # Set up directories
ME="$(readlink -f "$0")" ME="$(readlink -f "$0")"
LOCATION="$(dirname "$ME")" LOCATION="$(dirname "$ME")"
@ -23,16 +23,13 @@ if [ -z "$BUILD_MODE" ]; then
BUILD_MODE="-DDEV_BUILD" BUILD_MODE="-DDEV_BUILD"
fi 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" WARNINGS="-Wno-write-strings -Wno-comment"
FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE"
INCLUDES="-I$SRC_ROOT -I$CUSTOM_ROOT" INCLUDES="-I$SRC_ROOT -I$CUSTOM_ROOT"
# Execute # 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" g++ $WARNINGS $FLAGS $INCLUDES "$BIN_ROOT/4ed_build.cpp" -g -o "$BUILD_ROOT/build"
pushd "$SRC_ROOT" pushd "$SRC_ROOT"
"$BUILD_ROOT/build" "$BUILD_ROOT/build"

6
bin/build-mac.sh
View File

@ -3,7 +3,7 @@
# If any command errors, stop the script # If any command errors, stop the script
set -e set -e
# Set up directories (mirrors build.bat) # Set up directories
# NOTE(yuval): Replaced readlink with realpath which works for both macOS and Linux # NOTE(yuval): Replaced readlink with realpath which works for both macOS and Linux
ME="$(realpath "$0")" ME="$(realpath "$0")"
LOCATION="$(dirname "$ME")" LOCATION="$(dirname "$ME")"
@ -23,10 +23,6 @@ if [ -z "$BUILD_MODE" ]; then
BUILD_MODE="-DDEV_BUILD" BUILD_MODE="-DDEV_BUILD"
fi 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" WARNINGS="-Wno-write-strings -Wno-comment -Wno-null-dereference -Wno-logical-op-parentheses -Wno-switch"
FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE" FLAGS="-D_GNU_SOURCE -fPIC -fpermissive $BUILD_MODE"