Add WXDIR to library search path for finding wx libs for custom libraries

This commit is contained in:
Joseph Lenox 2017-04-02 11:46:18 -05:00
parent 4304c2a1f4
commit ea28afba1d
2 changed files with 6 additions and 1 deletions

View File

@ -5,6 +5,7 @@ install:
- export SLIC3R_STATIC=1
- export CXX=g++-4.9
- export CC=g++-4.9
- export WXDIR=$HOME/wx302
- source $HOME/perl5/perlbrew/etc/bashrc
script:
- bash package/linux/travis-setup.sh

View File

@ -10,7 +10,11 @@ if [ "$#" -ne 1 ]; then
echo "Usage: $(basename $0) arch_name"
exit 1;
fi
libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
if [ -z ${WXDIR+x} ]; then
libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
else
libdirs=$(find {$WXDIR,./local-lib} -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
fi
WD=./$(dirname $0)
source $(dirname $0)/../common/util.sh
# Determine if this is a tagged (release) commit.