This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 44d01d6c47277454d4eb1e139fa04093f5d23082 (commit)
from e937d2fe16dcbcaf6b3f38f8ae18b52c922df298 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 44d01d6c47277454d4eb1e139fa04093f5d23082
Author: Lawrence Sebald <ljs...@us...>
Date: Sun May 3 17:09:55 2015 -0400
Add an automatic default for the KOS_PORTS env var if it isn't set.
-----------------------------------------------------------------------
Summary of changes:
doc/environ.sh.sample | 3 ---
environ_base.sh | 8 +++++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/environ.sh.sample b/doc/environ.sh.sample
index 77beb8d..258ae1a 100644
--- a/doc/environ.sh.sample
+++ b/doc/environ.sh.sample
@@ -58,9 +58,6 @@ export DC_ARM_PREFIX="arm-eabi"
# Expand PATH (comment out if you don't want this done here)
export PATH="${PATH}:${KOS_CC_BASE}/bin:/opt/toolchains/dc/bin"
-# Manually add our second addons tree
-export KOS_INC_PATHS="-I${KOS_BASE}/../kos-ports/include"
-
# reset some options because there's no reason for them to persist across
# multiple sourcing of this
export KOS_CFLAGS=""
diff --git a/environ_base.sh b/environ_base.sh
index 6142363..29ce451 100644
--- a/environ_base.sh
+++ b/environ_base.sh
@@ -1,6 +1,11 @@
# KallistiOS environment variable settings. These are the shared pieces
# that are generated from the user config. Configure if you like.
+# Default the kos-ports path if it isn't already set.
+if [ -z "${KOS_PORTS}" ] ; then
+ export KOS_PORTS="${KOS_BASE}/../kos-ports"
+fi
+
# Pull in the arch environ file
. ${KOS_BASE}/environ_${KOS_ARCH}.sh
@@ -9,7 +14,8 @@ export PATH="${PATH}:${KOS_BASE}/utils/gnu_wrappers"
# Our includes
export KOS_INC_PATHS="${KOS_INC_PATHS} -I${KOS_BASE}/include \
--I${KOS_BASE}/kernel/arch/${KOS_ARCH}/include -I${KOS_BASE}/addons/include"
+-I${KOS_BASE}/kernel/arch/${KOS_ARCH}/include -I${KOS_BASE}/addons/include \
+-I${KOS_PORTS}/include"
# "System" libraries
export KOS_LIB_PATHS="-L${KOS_BASE}/lib/${KOS_ARCH} -L${KOS_BASE}/addons/lib/${KOS_ARCH} -L${KOS_PORTS}/lib"
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
