Commit graph

745 commits

Author SHA1 Message Date
Marius Kintel
5893b88db2 Merge branch 'master' of github.com:openscad/openscad 2016-10-07 15:35:59 +02:00
Marius Kintel
06c2847b58 Bumped OpenCSG to 1.4.2 2016-10-07 15:35:46 +02:00
Marius Kintel
836f9ff8de Merge pull request #1817 from openscad/wininfo_fix_2016
Wininfo fix 2016 for issue #1800
2016-10-07 13:03:49 +02:00
Don Bright
c2df8a6f42 fix previous commit (show fmt.str() ) 2016-10-06 21:33:28 -05: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
Don Bright
933344b869 forgot to add winmanifest.xml , simplify sysinfo string 2016-10-06 19:18:18 -05:00
Marius Kintel
7a17e50982 Merge pull request #1772 from vesim987/master
fix: Qt moved QT_VERSION_STR to qconfig.h
2016-10-07 00:46:28 +02:00
don bright
0eadea0b71 second attempt to add manifest 2016-10-04 23:08:56 -05:00
don bright
f4dc1bfcce attempt to add windows (TM) manifest file 2016-10-04 22:30:49 -05:00
Andrew Plumb
40b6e5007d File names changed to QScintilla_gpl-2.9.2.tar.gz
Looks like the project decided to change QScintilla-gpl-* to QScintilla_gpl-* in version 2.9.2 and 2.9.3.
2016-09-22 18:04:10 -04:00
Torsten Paul
a5e4def690 Add libxml2. 2016-09-17 23:22:04 +02:00
don bright
a2e658e709 use qt4 on kde neon linux distro, issue #1792 2016-09-15 03:50:24 -05:00
don bright
7b43c83abb Merge branch 'master' of github.com:openscad/openscad 2016-09-14 22:27:23 -05:00
don bright
e65a2b2bd6 dont look at /etc/fedora-release if it doesnt exist (prevent error) 2016-09-14 22:21:31 -05:00
Thomas.Meschede
f0b34548ec dependency helper scripted adapted for KDE Neon distribution 2016-09-14 10:06:21 +02:00
Marius Kintel
4a0ac7b2fa Updated to OpenCSG 1.4.1 2016-09-11 14:40:52 -04:00
don bright
ba26a08d1b fix build on ubuntu 16 by upgrading version of gmp + cgal 2016-09-09 01:27:12 +00:00
Marius Kintel
acb5b6fc03 Merge branch 'master' of github.com:openscad/openscad 2016-09-01 22:37:38 -04:00
Marius Kintel
f82bb52b17 Use proper qscintilla2 package. Don't unlink boost. Fixes #1784 2016-09-01 22:37:35 -04:00
Marius Kintel
4272a97d76 Merge pull request #1782 from openscad/ppc64buildfix2016
Ppc64buildfix2016
2016-09-01 22:33:57 -04:00
don bright
733562b1ee fix build on newer fedora 2016-08-25 23:50:58 +00:00
Don Bright
9dd6ddf9b9 prevent font direction bug by upgrading freetype version 2016-08-25 01:19:16 -04:00
Don Bright
c78275eca4 avoid font direction bug by upgrading harfbuzz version 2016-08-25 01:02:52 -04:00
Don Bright
65c252665a Merge branch 'ppc64buildfix2016' of github.com:openscad/openscad into ppc64buildfix2016 2016-08-25 01:01:06 -04:00
Don Bright
3d5c11b077 fix bug with directional font rendering by upgrading harfbuzz version 2016-08-25 01:00:10 -04:00
don bright
e3acb6c79f qscintilla build workarounds 2016-08-25 04:30:13 +00:00
Don Bright
c53fa5a64e fix for debian 8 build 2016-08-24 23:31:47 -04:00
don bright
a42b2dda6f build fixes for gcc110 (IBM ppc64 gcc farm machine at OSUOSL) 2016-08-25 03:10:34 +00:00
Don Bright
8b7b6fb165 build on ElementaryOS 2016-08-24 07:14:39 -05:00
don bright
37bc956ba3 fix test build on ubuntu 16 lts 2016-08-18 22:13:23 -05:00
vesim987
eaabf670ca fix: Qt moved QT_VERSION_STR to qconfig.h 2016-08-14 16:49:36 +02:00
Don
af338f3575 fix ubuntu 16 build 2016-08-11 20:52:50 -05:00
Marius Kintel
a0d9273129 Turn off parallel tests on trusty 2016-07-20 14:05:37 -04:00
Marius Kintel
e977ab388b More travis debug output 2016-07-19 18:32:52 -04:00
Marius Kintel
2c56845fe8 Merge pull request #1716 from openscad/travis-osx
Travis build for OS X & Trusty
2016-07-19 17:41:07 -04:00
Marius Kintel
a7d94ad0f8 Enable DIST-specific test parallelization 2016-07-19 16:50:13 -04:00
Marius Kintel
d28811864b Disable svgpngtest_text-font-direction-tests (#899) 2016-07-19 16:00:34 -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
204032ba9e We now require OS X >= 10.8 2016-07-15 01:26:15 -04:00
Marius Kintel
10f80dd9c4 Updated libraries, use @rpath instead of absolute paths 2016-06-25 17:31:47 -04:00
Marius Kintel
d5bf793814 Qt 5.7 requires OS X 10.8+ 2016-06-25 17:29:17 -04:00
Marius Kintel
de6c9f6564 sync with 2015.03-branch 2016-02-17 16:34:07 -05:00
Marius Kintel
be4fd23dc6 Cleaned out old 32-bit Mac builds 2016-01-27 14:18:03 -05:00
Marius Kintel
27c05e1132 Our custom FindBoost.cmake was removed a while ago 2016-01-06 13:22:40 -05:00
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
Torsten Paul
a7298a1c1b Read categories from examples.json. 2015-11-28 18:24:16 +01:00
Torsten Paul
94cfd4fce4 Update JS libs and add non-minified source to ease Linux distro packaging. 2015-11-28 18:23:56 +01: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