X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fvis_stu_vars.sh;h=1989f7566bc54d0b9165076e461a0de8e0829354;hb=c957a4bb5861666f963dc1334046427132afcc52;hp=a4de1dca869693e8c58d16e2b5fd0bc4afdf5ab6;hpb=805aef436e1d6d5baccf79ac23e9dd2799f37a92;p=feisty_meow.git

diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh
index a4de1dca..1989f756 100644
--- a/scripts/generator/vis_stu_vars.sh
+++ b/scripts/generator/vis_stu_vars.sh
@@ -51,9 +51,9 @@ if [ ! -d "$PLATFORM_DIR" ]; then
 fi
 export WindowsSdkDir="$PLATFORM_DIR"
 
-echo "path before is $PATH"
+#echo "path before is $PATH"
 export PATH="$DevEnvDir:$VCINSTALLDIR/BIN:$VSxTOOLS:$VSxTOOLS/bin:$FrameworkDir/$FrameworkVersion:$FrameworkDir/v3.5:$VCINSTALLDIR/VCPackages:$VSINSTALLDIR/Common7/Tools:$PLATFORM_DIR/bin:$PATH"
-echo "path after is $PATH"
+#echo "path after is $PATH"
 
 export INCLUDE="$VCINSTALLDIR/ATLMFC/INCLUDE:$VCINSTALLDIR/INCLUDE:$PLATFORM_DIR/include"
 #:$FrameworkSDKDir/include"
@@ -62,19 +62,31 @@ export LIB="$VCINSTALLDIR/ATLMFC/LIB:$VCINSTALLDIR/LIB:$PLATFORM_DIR/lib"
 #:$FrameworkSDKDir/lib"
 
 # convert framework dir back or things yell like hell.
-export FrameworkDir="$(echo $FrameworkDir | sed -e 's/^\/\(.\)[\\\/]\(.*\)$/\1:\\\2/' | tr "/" "\\" 2>/dev/null )"
+export FrameworkDir=$(unix_to_dos_path $FrameworkDir)
   # the redirection of stderr to null is to get around an obnoxious cygwin
   # warning that seems to be erroneously bitching about backslashes.
 
+# convert all other relevant paths back to dos form, or visual studio barfs.
+#export BUILD_SCRIPTS_DIR=$(unix_to_dos_path $BUILD_SCRIPTS_DIR)
+#export BUILDING_HIERARCHY=$(unix_to_dos_path $BUILDING_HIERARCHY)
+#export BUILDER_DIR=$(unix_to_dos_path $BUILDER_DIR)
+#export BUILD_TOP=$(unix_to_dos_path $BUILD_TOP)
+#export PRODUCTION_DIR=$(unix_to_dos_path $PRODUCTION_DIR)
+#export LOGS_DIR=$(unix_to_dos_path $LOGS_DIR)
+#export TOOL_SOURCES=$(unix_to_dos_path $TOOL_SOURCES)
+#export BINARY_DIR=$(unix_to_dos_path $BINARY_DIR)
+#export TARGETS_DIR=$(unix_to_dos_path $TARGETS_DIR)
+#export INTERMEDIATE_EXE_DIR=$(unix_to_dos_path $INTERMEDIATE_EXE_DIR)
+#export WASTE_DIR=$(unix_to_dos_path $WASTE_DIR)
 
 ##############
 
-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 "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
 
 ##############