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

More fixes to CI scripts

Browse Source
This commit is contained in:
Alessandro Ranellucci 2018-11-07 16:49:01 +01:00
parent 390d613e87
commit c9ce5bf3ae
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/linux/travis-build-main.sh
View File

@ -31,10 +31,7 @@ tar -C$HOME/perl5/perlbrew/perls -xjf $CACHE/slic3r-perlbrew-5.24.tar.bz2
tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2 tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2 tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
export PERLBREW_SKIP_INIT=0
source $HOME/perl5/perlbrew/etc/bashrc source $HOME/perl5/perlbrew/etc/bashrc
perlbrew switch slic3r-perl perlbrew switch slic3r-perl
# CXX=g++-4.9 ? SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL
# CC=g++-4.9 ?
SLIC3R_STATIC=1 CC=gcc-7 CXX=g++-7 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL

4
package/osx/patch-wxwidgets.diff
View File

@ -17,7 +17,7 @@ diff --git src/osx/core/bitmap.cpp src/osx/core/bitmap.cpp
index 3c61c173e7..3322b605fc 100644 index 3c61c173e7..3322b605fc 100644
--- src/osx/core/bitmap.cpp --- src/osx/core/bitmap.cpp
+++ src/osx/core/bitmap.cpp +++ src/osx/core/bitmap.cpp
@@ -35,10 +35,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) @@ -35,10 +35,6 @@
#include "wx/osx/private.h" #include "wx/osx/private.h"
#endif #endif
@ -32,7 +32,7 @@ diff --git src/stc/scintilla/src/Editor.cxx src/stc/scintilla/src/Editor.cxx
index cd72953ae7..a3ee41c49b 100644 index cd72953ae7..a3ee41c49b 100644
--- src/stc/scintilla/src/Editor.cxx --- src/stc/scintilla/src/Editor.cxx
+++ src/stc/scintilla/src/Editor.cxx +++ src/stc/scintilla/src/Editor.cxx
@@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) { @@ -5841,9 +5841,9 @@
} }
static bool Close(Point pt1, Point pt2) { static bool Close(Point pt1, Point pt2) {

1
package/osx/travis-build-main.sh
View File

@ -10,6 +10,7 @@ perl ./Build.PL
# Only recompile Wx if it's not already there # Only recompile Wx if it's not already there
if !(perl -MWx -e1 2> /dev/null); then if !(perl -MWx -e1 2> /dev/null); then
# our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2
PERL_USE_UNSAFE_INC=1 \ PERL_USE_UNSAFE_INC=1 \
CXX="clang++ -mmacosx-version-min=10.12" \ CXX="clang++ -mmacosx-version-min=10.12" \
CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \ CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \