Try Alien::wxWidgets and brew

This commit is contained in:
Alessandro Ranellucci 2018-11-08 15:27:59 +01:00
parent cbb618a381
commit 2d3c17842c
2 changed files with 7 additions and 8 deletions

View File

@ -27,7 +27,6 @@ branches:
only: only:
- master - master
- cppgui - cppgui
- osxbuild
addons: addons:
apt: apt:

View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
brew update -v brew update -v
brew install boost perl cpanminus brew install boost perl cpanminus wxwidgets
export SLIC3R_STATIC=1 export SLIC3R_STATIC=1
export BOOST_DIR=/usr/local export BOOST_DIR=/usr/local
@ -11,12 +11,12 @@ perl ./Build.PL
# Only recompile Wx if it's not already there # Only recompile Wx if it's not already there
if [ ! -e ./local-lib/lib/perl5/darwin-thread-multi-2level/Wx.pm ]; then if [ ! -e ./local-lib/lib/perl5/darwin-thread-multi-2level/Wx.pm ]; then
# our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2 # 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" \
LDFLAGS="-mmacosx-version-min=10.12" \ # LDFLAGS="-mmacosx-version-min=10.12" \
cpanm --local-lib local-lib Alien::wxWidgets --reinstall \ # cpanm --local-lib local-lib Alien::wxWidgets --reinstall \
--configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/package/osx/patch-wxwidgets.diff" # --configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/package/osx/patch-wxwidgets.diff"
PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master
fi fi