Commit graph

14 commits

Author SHA1 Message Date
Marius Kintel
ce3a6f75b6 forgot libzip 2016-10-29 12:00:15 -04:00
Marius Kintel
fa2ec3a49b Keep it simple 2016-10-29 00:22:46 -04:00
Marius Kintel
8609ebb5af output cosmetics 2016-10-29 00:11:32 -04:00
Torsten Paul
72acc2807b Show homebrew installation progress. 2016-10-29 00:00:38 -04:00
Marius Kintel
3a9b12723f Merge remote-tracking branch 'origin/master' into amf-import 2016-10-23 21:27:44 -04:00
Torsten Paul
569c11fbde Don't rely on return status from brew ls --versions.
This seems to have changed with the Taravis macOS environment upgrade
to travis-ci-osx10.11-xcode7.3.
2016-10-07 03:52:22 +02:00
Torsten Paul
c88001d44a Add libzip to homebrew build for Travis. 2016-09-20 03:02:36 +02:00
Marius Kintel
f82bb52b17 Use proper qscintilla2 package. Don't unlink boost. Fixes #1784 2016-09-01 22:37:35 -04:00
Marius Kintel
9bcab11129 Added OS X build and trusty build to travis config 2016-07-19 15:32:27 -04:00
Marius Kintel
2cba2a1b55 Merge branch 'master' into text-module
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
2014-04-26 22:08:31 -04:00
Marius Kintel
c7530012be Build qt5 2014-02-04 01:21:13 -05:00
Marius Kintel
256a52d9c6 Added libs needed for text() module. Added support for MACOSX_DEPLOYMENT_TARGET 2014-02-03 20:18:50 -05:00
Marius Kintel
4da5657705 Made executable 2014-01-29 18:56:06 -05:00
Marius Kintel
5affb45eb3 Experimental homebrew dependency build 2014-01-04 18:14:14 -05:00