X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fvis_stu_vars.sh;h=546d86277be7708fcfc4a3a8f6189a1648b38701;hb=b6393801b03e81598e3ef6dfa58d473174f1e7b9;hp=2ab5ba08829116628157a5254543923ec7fe0076;hpb=102061cab065f647954f3e935f11f433e2f088d4;p=feisty_meow.git diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh index 2ab5ba08..546d8627 100644 --- a/scripts/generator/vis_stu_vars.sh +++ b/scripts/generator/vis_stu_vars.sh @@ -19,9 +19,6 @@ fi function setup_visual_studio_variables() { - chmod 755 $PRODUCTION_DIR/win32_helper/*.exe - export PATH="$(dos_to_unix_path $PRODUCTION_DIR)/win32_helper:$PATH" - # we try to use the most recent compiler location, and work backwards as # needed for the supported range (10 = vs 2010, 9 = vs 2008, 8 = vs 2005). export VSxTOOLS="$VS100COMNTOOLS" @@ -35,14 +32,14 @@ function setup_visual_studio_variables() if [ -z "$VSxTOOLS" ]; then return 33 fi - export VSxTOOLS="$(short_path "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' )" + export VSxTOOLS="$(cygpath -w -s "$VSxTOOLS" | tr "A-Z" "a-z" | sed -e 's/\\/\//g' )" #| sed -e 's/^\(.\):/\/\1/' )" export VIS_STU_ROOT="$(echo $VSxTOOLS | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" #| sed -e 's/^\(.\):/\/\1/' )" export VSINSTALLDIR="$VIS_STU_ROOT" - export WINDIR="$(short_path "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' )" + export WINDIR="$(cygpath -w -s "$WINDIR" | tr A-Z a-z | sed -e 's/\\/\//g' )" #| sed -e 's/^\(.\):/\/\1/' )" export VCINSTALLDIR="$VSINSTALLDIR/VC" @@ -57,7 +54,7 @@ function setup_visual_studio_variables() export PLATFORM_DIR="$VCINSTALLDIR/PlatformSDK" if [ ! -d "$PLATFORM_DIR" ]; then -#on hold: export PLATFORM_DIR="$(short_path "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" +#on hold: export PLATFORM_DIR="$(cygpath -w -s "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" ##| sed -e 's/^\(.\):/\/\1/' )" # guess at where we can find this damned directory in its short form.