From 45f7327743f8534e2712f62da63569f7615fb229 Mon Sep 17 00:00:00 2001 From: "Michael D. Lowis" Date: Thu, 1 Oct 2020 20:50:29 -0400 Subject: [PATCH] updated tool scripts --- config.mk | 5 +++++ tools/Binary | 4 +++- tools/Library | 2 ++ tools/Object | 4 +++- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 config.mk diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..aa01ec9 --- /dev/null +++ b/config.mk @@ -0,0 +1,5 @@ +CC=cc +CPPPATH="-Iinc -I/usr/X11/include -I/usr/X11/include/freetype2 -I/usr/include/freetype2" +CFLAGS="--std=c99 -Wall -Wextra -Werror" + +export CC CPPPATH CFLAGS \ No newline at end of file diff --git a/tools/Binary b/tools/Binary index d070e58..5d5b1bc 100755 --- a/tools/Binary +++ b/tools/Binary @@ -1,12 +1,14 @@ #!/bin/sh +. config.mk + if [ -d "$2" ]; then echo "Binary $1" else if [ "$2" -nt "$1" ]; then echo "Binary $1" mkdir -p build/bin - cc -Iinc/ --std=c99 -Wall -Wextra -Werror -I/usr/include/freetype2 -o "$@" + $CC $CPPPATH $CFLAGS -o "$@" fi fi diff --git a/tools/Library b/tools/Library index 2aca2b0..d2b32bd 100755 --- a/tools/Library +++ b/tools/Library @@ -1,5 +1,7 @@ #!/bin/sh +. config.mk + srcdir="${1:?No library directory specified}" srcdir="${srcdir%/}" lib="${srcdir##*/}" diff --git a/tools/Object b/tools/Object index 893d961..5a43b72 100755 --- a/tools/Object +++ b/tools/Object @@ -1,6 +1,8 @@ #!/bin/sh +. config.mk + if [ "$2" -nt "$1" ]; then echo "Object $1" - cc -Iinc/ --std=c99 -Wall -Wextra -Werror -I/usr/include/freetype2 -c -o "$@" + $CC $CPPPATH $CFLAGS -c -o "$@" fi \ No newline at end of file -- 2.52.0