projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slightly closer to doze builds
[feisty_meow.git]
/
scripts
/
generator
/
build_variables.sh
diff --git
a/scripts/generator/build_variables.sh
b/scripts/generator/build_variables.sh
index c8a4c3ec637ba19c1fecbbb8e0aa2c1d5b89f1e1..2db3e06e904998cf04d4b476ca6d10a4f2bd46fb 100644
(file)
--- a/
scripts/generator/build_variables.sh
+++ b/
scripts/generator/build_variables.sh
@@
-1,3
+1,5
@@
+#!/bin/bash
+
##############
#
# Name : build variable calculator
##############
#
# Name : build variable calculator
@@
-179,12
+181,12
@@
if [ -z "$got_bad" ]; then
# where we store the binaries used for building the rest of the code base.
export CLAM_BINARIES="$RUNTIME_PATH/clam_bin"
# where we store the binaries used for building the rest of the code base.
export CLAM_BINARIES="$RUNTIME_PATH/clam_bin"
- # the final destination for the new binaries which provide the
hoople
- # build with all the apps it needs to get going.
+ # the final destination for the new binaries which provide the
+ # build with all the app
lication
s it needs to get going.
export TARGETS_STORE="$RUNTIME_PATH/binaries"
# targets directory is meaningful to clam, which will use it for output.
export INTERMEDIATE_STORE="$TARGETS_STORE"
export TARGETS_STORE="$RUNTIME_PATH/binaries"
# targets directory is meaningful to clam, which will use it for output.
export INTERMEDIATE_STORE="$TARGETS_STORE"
- # where we are building the apps before they get promoted.
+ # where we are building the app
lication
s before they get promoted.
#hmmm: could allow override on this if already set.
# calculate which build ini file to use.
#hmmm: could allow override on this if already set.
# calculate which build ini file to use.
@@
-206,9
+208,12
@@
if [ -z "$got_bad" ]; then
# load up the helper variables for visual studio on winders.
if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
# load up the helper variables for visual studio on winders.
if [ "$OPERATING_SYSTEM" == "WIN32" ]; then
- source "$BUILD_SCRIPTS_PATH/vis_stu_vars.sh"
+ # moved back to the good path of using gcc, not visual studio.
+#what vars needed?
+#trying just unixy ones, since we're doing cygwin on doze.
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TARGETS_STORE"
else
else
- export LD_LIBRARY_PATH="$TARGETS_STORE"
+ export LD_LIBRARY_PATH="$
LD_LIBRARY_PATH:$
TARGETS_STORE"
fi
popd &>/dev/null # checking is over, jump back to the starting point.
fi
popd &>/dev/null # checking is over, jump back to the starting point.