diff --git a/.travis.yml b/.travis.yml index ede2099d9..31a5a1c41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh index 92ce34e68..8a8acc9b5 100755 --- a/package/linux/make_archive.sh +++ b/package/linux/make_archive.sh @@ -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.