X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fvis_stu_vars.sh;h=1fe1a43866bc073b3c86593c933583ce8a64d1d1;hb=350c5e348c3263a4d48307057e2de34166a53b04;hp=e5c6322ddeddb2ad91a9fc3fbad14eff4aa319df;hpb=a327cbf94ba64b8c1104bfca4f6a2d5ce2fd7e00;p=feisty_meow.git diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh index e5c6322d..1fe1a438 100644 --- a/scripts/generator/vis_stu_vars.sh +++ b/scripts/generator/vis_stu_vars.sh @@ -60,7 +60,23 @@ function setup_visual_studio_variables() #on hold: export PLATFORM_DIR="$(short_path "$PROGRAMFILES/Microsoft SDKs/Windows/v7.0A" | tr "A-Z" "a-z" | sed -e 's/^\(.*\)\/[^\/]*\/[^\/]*[\/]$/\1/' )" ##| sed -e 's/^\(.\):/\/\1/' )" -export PLATFORM_DIR="c:\progra~2\micros~1\windows\v7.0a" + # guess at where we can find this damned directory in its short form. +#hmmm: this is needed until there's a replacement for short path, or we can build again. + export PLATFORM_DIR="c:/progra~2/micros~1/windows/v7.0a" + if [ ! -d "$PLATFORM_DIR" ]; then + PLATFORM_DIR="c:/progra~1/micros~1/windows/v7.0a" + if [ ! -d "$PLATFORM_DIR" ]; then + PLATFORM_DIR="c:/progra~1/micros~2/windows/v7.0a" + if [ ! -d "$PLATFORM_DIR" ]; then + PLATFORM_DIR="c:/progra~2/micros~2/windows/v7.0a" + fi + fi + fi + + if [ ! -d "$PLATFORM_DIR" ]; then + echo "*** Failure to calculate the platform directory based on several attempts using c:\\program files\\microsoft sdks\\windows\\v7.0a as the basic pattern" + fi + fi export WindowsSdkDir="$PLATFORM_DIR" @@ -98,16 +114,8 @@ export PLATFORM_DIR="c:\progra~2\micros~1\windows\v7.0a" ############## - echo "visual studio root is '$VIS_STU_ROOT'" - echo "common tools dir is '$VSxTOOLS'" - echo "cleaned windir is '$WINDIR'" - echo "cleaned comn tools is '$VSxTOOLS'" - echo "root of visual studio is '$VSINSTALLDIR'" - echo "platform dir is '$PLATFORM_DIR'" - echo "framedir now '$FrameworkDir'" - -echo new report style: -var VIS_STU_ROOT VSxTOOLS WINDIR VSxTOOLS VSINSTALLDIR PLATFORM_DIR FrameworkDir + echo "calculated variables for dos/windoze builds:" + var VIS_STU_ROOT VSxTOOLS WINDIR VSxTOOLS VSINSTALLDIR PLATFORM_DIR FrameworkDir ############## }