mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-08-01 18:10:39 +08:00
broke script out, trying to avoid gcc-4 getting used on linux for whatever reason
This commit is contained in:
parent
e829d05cc0
commit
18d3ccf581
13
.travis.yml
13
.travis.yml
@ -1,12 +1,9 @@
|
|||||||
before_install:
|
before_install:
|
||||||
- sh package/linux/travis-decrypt-key
|
- sh package/linux/travis-decrypt-key
|
||||||
|
- bash package/linux/travis-setup.sh
|
||||||
install:
|
install:
|
||||||
- export BOOST_DIR=$HOME/boost_1_63_0
|
- export BOOST_DIR=$HOME/boost_1_63_0
|
||||||
- export SLIC3R_STATIC=1
|
- export SLIC3R_STATIC=1
|
||||||
script:
|
|
||||||
- bash package/linux/travis-setup.sh
|
|
||||||
- cmake -DBOOST_ROOT=$BOOST_DIR -DwxWidgets_ROOT_DIR=$WXDIR src/
|
|
||||||
- make VERBOSE=1
|
|
||||||
after_success:
|
after_success:
|
||||||
- LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
|
- LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
|
||||||
- package/linux/appimage.sh x86_64
|
- package/linux/appimage.sh x86_64
|
||||||
@ -50,12 +47,16 @@ matrix:
|
|||||||
- os: linux
|
- os: linux
|
||||||
language: c++
|
language: c++
|
||||||
env:
|
env:
|
||||||
- CXX=g++-7
|
|
||||||
- CX=gcc-7
|
|
||||||
- WXVERSION=pkg
|
- WXVERSION=pkg
|
||||||
|
script:
|
||||||
|
- CXX=g++-7 CC=gcc-7 cmake -DBOOST_ROOT=$BOOST_DIR src/
|
||||||
|
- make
|
||||||
- os: osx
|
- os: osx
|
||||||
language: c++
|
language: c++
|
||||||
env: WXVERSION=pkg
|
env: WXVERSION=pkg
|
||||||
|
script:
|
||||||
|
- cmake -DBOOST_ROOT=$BOOST_DIR src/
|
||||||
|
- make
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8=
|
- secure: eEVRZNMv7FM6jrOU9iAFkDhWxFQ1WtHBEaObImcvtFUxy6vWSt3ehFFeTRouj3uHQAnbvUzziDyvPPm8/95alv5g/du8ML6YzzqKBKfazM0xQ7SF6R2DQL8lfFIp+RSV7T02byEP1f1g7Zva7xH9szIlDcSfU0pXW4KWbkBFMd8=
|
||||||
|
Loading…
x
Reference in New Issue
Block a user