Commit graph

138 commits

Author SHA1 Message Date
Marius Kintel
1d5bdcc4d5 doc 2015-12-02 16:36:21 -05:00
Marius Kintel
9bf581fcf3 Merge branch 'master' of github.com:openscad/openscad 2015-12-01 22:10:47 -05:00
Marius Kintel
9025199225 #1493 Revert QScintilla to 2.8.4 2015-12-01 22:10:30 -05:00
Andrew Plumb
779e9c504c Update macosx-build-dependencies.sh
Split the single 'make -j"$NUMCPU" install' into two-stage.
2015-11-22 00:23:06 -05:00
Andrew Plumb
6f57125efa Update macosx-build-dependencies.sh
Addresses the build problem captured in issue #1490.
2015-11-21 21:55:18 -05:00
Marius Kintel
e15c36f53f Patch Qt scaling issue when using pixmaps in QLabels 2015-11-03 02:21:42 -05:00
Marius Kintel
fbb5e895ab Updated Qt to 5.5.1, Sparkle to 1.11.0, added tweaks to build using Xcode 7 2015-11-03 01:35:11 -05:00
Marius Kintel
e3c1a90a97 Detect El Capitan 2015-10-26 15:39:19 -04:00
Marius Kintel
9a83b0bacf Updated dependencies 2015-10-16 16:33:48 -04:00
Marius Kintel
7310cd7aab CGAL-4.6.3 2015-10-16 14:00:13 -04:00
Marius Kintel
2745b8534c Updated harfbuzz to 0.9.40 2015-06-07 13:09:41 -04:00
Marius Kintel
e21b321323 Allow compiling against libstdc++ and c++03 2015-04-26 16:11:10 -04:00
Marius Kintel
e5e9f20f95 Prefer http over ftp 2015-04-15 14:35:12 -07:00
Marius Kintel
d37f4fbbab install in normal location, set c++11 as default for dependencies 2015-03-20 20:16:55 -04:00
Marius Kintel
e78206d2aa Separate out std/stdlib flags since ragel doesn't currently build with C++11 2015-03-12 01:38:12 -04:00
Marius Kintel
394cc15fba Merge remote-tracking branch 'origin/master' into c++11 2015-03-10 22:08:06 -04:00
Marius Kintel
b9e1b6603e Bumped to Qt-5.4.1 2015-02-25 18:58:20 -05:00
Marius Kintel
54239a2534 Merge remote-tracking branch 'origin/master' into c++11 2015-02-17 15:28:58 -05:00
Marius Kintel
9dc76d2012 Bump CGAL to 4.5.2, don't automatically build 32-bit binaries in deployment mode 2015-02-16 23:52:55 -05:00
Marius Kintel
137928fced #669 C++11 build fix 2015-02-10 17:46:55 -05:00
Marius Kintel
7c2db84fe6 #669 Added C++11 support 2015-02-10 17:32:24 -05:00
Marius Kintel
571d2140c1 Updated Mac dependency build: Allow package selection on the cmd-line, allow forcing reinstall of already installed package 2015-02-09 19:19:00 -05:00
Marius Kintel
c80bb8a624 Bumped freetype to 2.5.5 2015-01-22 16:18:07 -05:00
Marius Kintel
5b865293a6 Library updates; qt-5.4.0, eigen-3.2.3, boost-1.57, cgal-4.5.1, glew-1.11, gettext-0.19.4, libffi-3.2.1, glib-2.42.1, libxml2-2.9.2 2015-01-05 01:56:24 -05:00
Marius Kintel
743732d874 Fix bug in harfbuzz build causing us to require OS X 10.9+ 2014-12-31 15:31:27 -05:00
Marius Kintel
6fc720d1b7 Bumped Eigen to 3.2.2 2014-12-31 15:02:20 -05:00
Torsten Paul
dd274b744a Fix download urls for freetype and ragel; bump freetype to 2.5.4. 2014-12-11 19:42:35 +01:00
Marius Kintel
82b599e8ba Bumped Qt to 5.3.2 2014-12-07 18:07:53 -05:00
Marius Kintel
4ef9f3e817 Bumped QScintilla to 2.8.4 2014-11-08 19:45:02 -05:00
Marius Kintel
cf979b3900 Bumped Ragel to 6.9 and harfbuzz to 0.9.35 2014-10-31 12:34:54 +04:00
Marius Kintel
6c703ab3ef Bugfix: OpenCSG-1.4.0 installed the lib in the wrong location. Fixes #997 2014-10-31 12:34:19 +04:00
Marius Kintel
5669f0d95f Bumped CGAL to 4.5 2014-10-19 17:56:51 -04:00
Marius Kintel
e00292b445 Updated OpenCSG build to correctly set the install name 2014-09-30 15:27:24 -04:00
Marius Kintel
72e09b6891 Updated to OpenCSG-1.4.0 2014-09-15 18:27:40 -04:00
Marius Kintel
080c9ea193 Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	scripts/macosx-build-dependencies.sh
2014-08-09 22:27:40 -05:00
Torsten Paul
475bf8a90f Update MacOS X dependency build.
- use $NUMCPU for parallel build
- don't always rebuild libs when already installed
- switch to Qt 5.3.1 and disable most modules
- switch to eigen 3.2.1
- fix build order for ragel (needed by harfbuzz build)
2014-08-03 14:37:46 +02:00
Marius Kintel
fbe08862ca #879 change install name. qtmacdeploy requires a full install name path 2014-07-22 17:09:59 -04:00
Marius Kintel
74ec208581 QScintilla build script for Mac 2014-07-17 15:11:33 -04:00
Marius Kintel
1d5ff65e04 freetype and harfbuzz build fixes, updated gettext, ffi, glib, harfbuzz 2014-05-29 01:19:12 -04:00
Marius Kintel
c73dfa6e8e Updated to Qt-5.3.0 and CGAL-4.4 2014-05-29 00:22:59 -04:00
Marius Kintel
6ed870b53a Change order of dependency builds to avoid picking up the wrong dependency 2014-05-22 21:55:22 -04:00
Torsten Paul
c64360d372 Merge branch 'master' into text-module
Conflicts:
	tests/CMakeLists.txt
2014-05-20 21:36:51 +02:00
Marius Kintel
ca765dd688 #252 Downgrade to Qt-5.2.0 for Mac 2014-05-12 13:32:50 -04:00
Marius Kintel
11ef366601 Make Mac dependencies work on 10.7+. This causes some weird artifacts. See #633 2014-04-27 01:02:18 -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
05e1dd7df4 #252 Use Qt5 as default for Mac snapshots 2014-04-25 02:00:06 -04:00
Torsten Paul
9c484f2091 Add libffi to MacOS build. 2014-02-02 18:01:09 -05:00
Torsten Paul
b5755b6aa0 Add libxml2 to MacOS X build. 2014-02-02 18:01:08 -05:00
Torsten Paul
dc16918beb Force pkg-config to look in the local library folder.
Setting both PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR should
force pkg-config to ignore system installed libraries. We
only want it to find locally compiled dependencies if the
variable OPENSCAD_LIBRARIES is set.
2014-02-02 18:00:45 -05:00
Torsten Paul
39a2136e3d Fix dependency build script on MacOS X. 2014-02-02 18:00:45 -05:00