X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbuild_variables.sh;h=9281730febe0be3e14427bb2e484a2b5ed214b15;hb=0237507bda3ecd0cebab0eeddc3cfefa4d9b3650;hp=a4843191480947b1e7d9eafe99a9e81322457f46;hpb=47898c86d34ba851288b62281c14f18f7090df19;p=feisty_meow.git diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh index a4843191..9281730f 100644 --- a/scripts/generator/build_variables.sh +++ b/scripts/generator/build_variables.sh @@ -71,13 +71,6 @@ export CLAM_DIR="$(cd $BUILD_SCRIPTS_DIR/../clam ; \pwd)" # synonym to make other builds happy. export BUILDER_DIR="$BUILDING_HIERARCHY" -# guess the current platform. -IS_UNIX=$(uname | grep -i linux) -if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi -if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi -IS_DOS=$(uname | grep -i ming) -if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi - # set some clam parameters for compilation. if the script can't guess the # right configuration, then you will need to set them in the last 'else' # below. @@ -95,6 +88,11 @@ if [ ! -z "$SHELL_DEBUG" ]; then echo "[FEISTY_MEOW_DIR is $FEISTY_MEOW_DIR]" fi +#if [ "$OPERATING_SYSTEM" == "WIN32" ]; then +# # harsh on the paths and make them use backwards slashes. +# export SERIOUS_SLASH_TREATMENT=true +#fi + # new BUILD_TOP variable points at the utter top-most level of any files # in the building hierarchy. export BUILD_TOP="$FEISTY_MEOW_DIR" @@ -195,7 +193,7 @@ if [ -z "$got_bad" ]; then # we should have established our internal variables now, so let's try # using them. - export PATH=$BINARY_DIR:$PATH + export PATH=$(dos_to_unix_path $BINARY_DIR):$PATH # load up the helper variables for visual studio on winders. if [ "$OPERATING_SYSTEM" == "WIN32" ]; then