X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbuild_variables.sh;h=2db3e06e904998cf04d4b476ca6d10a4f2bd46fb;hb=b6e53098085532567a9e267be2b600a5e3cf6f99;hp=c8a4c3ec637ba19c1fecbbb8e0aa2c1d5b89f1e1;hpb=2b8c3b9f11123159c7e0c20b550c7bfefd796317;p=feisty_meow.git diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh index c8a4c3ec..2db3e06e 100644 --- a/scripts/generator/build_variables.sh +++ b/scripts/generator/build_variables.sh @@ -1,3 +1,5 @@ +#!/bin/bash + ############## # # 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" - # 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 applications 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" - # where we are building the apps before they get promoted. + # where we are building the applications before they get promoted. #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 - 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 - 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.