GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 21:02:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

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

6
package/linux/make_archive.sh
View File

@ -10,7 +10,11 @@ if [ "$#" -ne 1 ]; then
echo "Usage: $(basename $0) arch_name" echo "Usage: $(basename $0) arch_name"
exit 1; exit 1;
fi 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) WD=./$(dirname $0)
source $(dirname $0)/../common/util.sh source $(dirname $0)/../common/util.sh
# Determine if this is a tagged (release) commit. # Determine if this is a tagged (release) commit.