From dad5741ce4f3f1a5bd7a10268061b5c73d035f92 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 21 Feb 2012 22:51:52 -0500 Subject: [PATCH] reduced extra paths. will re-add later if ever build on ms compiler again. --- scripts/core/variables.sh | 9 +++++---- scripts/generator/vis_stu_vars.sh | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 0e4c5ac2..5586ea16 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -155,11 +155,11 @@ if [ -z "$NECHUNG" ]; then export BINDIR=$FEISTY_MEOW_DIR/production/binaries # add binaries created within build to the path. - # export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH" - export PATH="$BUILD_TOP/build/bin:$PATH" +# export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH" + export PATH="$BINDIR:$PATH" # Shared libraries are located via this variable. - # export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)" +# export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BINDIR" fi } @@ -196,7 +196,8 @@ if [ -z "$NECHUNG" ]; then # set the path for locating applications. this is done after any # potential overrides from the user. #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:." - export PATH="$BINDIR:$FEISTY_MEOW_GENERATED:$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:." + export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:." +###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:. ############## diff --git a/scripts/generator/vis_stu_vars.sh b/scripts/generator/vis_stu_vars.sh index db431946..e50e4c67 100755 --- a/scripts/generator/vis_stu_vars.sh +++ b/scripts/generator/vis_stu_vars.sh @@ -59,7 +59,8 @@ export WindowsSdkDir="$PLATFORM_DIR" #echo platform dir is $PLATFORM_DIR #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" +#export PATH="$DevEnvDir:$VCINSTALLDIR/BIN:$VSxTOOLS:$VSxTOOLS/bin:$FrameworkDir/$FrameworkVersion:$FrameworkDir/v3.5:$VCINSTALLDIR/VCPackages:$VSINSTALLDIR/Common7/Tools:$PLATFORM_DIR/bin:$PATH" +#hmmm: yuck! wake me up when we don't need all of those in the path. #echo "path after is $PATH" export INCLUDE="$VCINSTALLDIR/ATLMFC/INCLUDE:$VCINSTALLDIR/INCLUDE:$PLATFORM_DIR/include" -- 2.34.1