Marius Kintel
31b90d1acb
Merge pull request #1008 from openscad/externalize-colorschemes2
...
Externalize colorschemes
2014-11-08 20:49:15 -05:00
Marius Kintel
4ef9f3e817
Bumped QScintilla to 2.8.4
2014-11-08 19:45:02 -05:00
Marius Kintel
01b845397a
Added buildonly option
2014-11-05 18:59:06 +04:00
Torsten Paul
073c6fe2b3
Add color schemes to Windows installer.
2014-11-02 16:39:03 +01: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
Torsten Paul
aefafd2ec5
Handle both Qt4 and Qt5 and add fallback in case of missing qscintilla2.prf.
2014-10-17 19:32:15 +02: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
Torsten Paul
155c275180
Add qscintilla2 to dependency list.
2014-09-05 19:58:31 +02:00
Torsten Paul
af69e95bbe
Check also lib64 path for glib-2.0; fixes detection on fedora20/64bit.
2014-09-05 18:43:37 +02:00
Marius Kintel
15d596099c
Disabled some tests for Travis which fails due to Gallium 0.4 driver issues on Ubuntu 12.04
2014-09-04 13:49:12 -04:00
Marius Kintel
845df0cce1
Merge remote-tracking branch 'origin/master' into scintillaeditor
...
Conflicts:
scripts/mingw-x-build-dependencies.sh
2014-09-03 12:46:54 -04:00
Marius Kintel
c7f8d283e2
Merge pull request #928 from openscad/mingw-master
...
MXE master / Fix Windows cache folder
2014-09-03 12:14:42 -04:00
Torsten Paul
2959cd0f30
Install fontconfig configuration folder.
2014-09-03 00:36:05 +02:00
Torsten Paul
fde1b89cd9
Switch to MXE master branch using mingw-w64/static targets.
2014-09-03 00:36:05 +02:00
Torsten Paul
89201c91c8
Suppress find error output.
2014-08-30 22:22:33 +02:00
Torsten Paul
2170e0ad2d
Detect qmake-qt5 first, use qmake as fallback (needed for fedora).
2014-08-30 21:32:21 +02:00
Torsten Paul
e00287c8a4
Update dependency script for fedora.
2014-08-30 21:07:22 +02:00
Marius Kintel
5dd4823936
Merge remote-tracking branch 'origin/master' into scintillaeditor
2014-08-28 12:04:12 -04:00
Marius Kintel
2edfed69b3
Copy font config for Mac binary build. The same should be done for Windows
2014-08-28 00:42:53 -04:00
Torsten Paul
67f0275618
Build fontconfig with --prefix=/ to let it pick up system data.
2014-08-26 21:24:02 +02:00
Torsten Paul
28dd3c6ec4
Use https download link for gmp.
2014-08-26 21:24:02 +02:00
Torsten Paul
c90e8f24e1
Update to Eigen 3.2.2, boost 1.56, cgal 4.4.
2014-08-26 21:24:02 +02:00
Torsten Paul
bc643b3cf5
Add packages needed for static Qt5 builds.
2014-08-26 21:24:02 +02:00
Torsten Paul
09dd11c7c4
Include swrast_dri driver.
2014-08-26 21:24:02 +02:00
Torsten Paul
f415ee239f
Remove dependency to libpng when building freetype.
2014-08-26 21:24:02 +02:00
Torsten Paul
90b8ac026c
Add curl and libffi-dev to Debian dependencies.
2014-08-26 21:24:02 +02:00
Torsten Paul
d4ac26d693
Use blacklist approach to include library dependencies.
2014-08-26 21:24:02 +02:00
Torsten Paul
4bdc4c4247
Add static dependency builds for Qt5 and QScintilla2.
2014-08-26 21:24:02 +02:00
Torsten Paul
28ded1166e
Update MXE build to master branch and mingw-w64 to support qscintilla2.
2014-08-26 19:12:11 +02:00
Marius Kintel
07e620e611
Merge remote-tracking branch 'origin/master' into scintillaeditor
2014-08-24 17:10:35 -04:00
Marius Kintel
138d5bc57e
Merge remote-tracking branch 'origin/master' into scintillaeditor
...
Conflicts:
src/MainWindow.h
src/Preferences.ui
src/mainwin.cc
2014-08-22 12:59:10 -04:00
Marius Kintel
8a9e0daa01
minor debug output fixes
2014-08-22 11:48:10 -04:00
Marius Kintel
c5050b03b7
fontconfig check by Don Bright
2014-08-13 23:32:27 -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
9d09e6475e
Disable failing test on Ubuntu 12.04 Gallium drivers
2014-06-14 16:27:37 -04:00
don bright
78803bfe10
builder.sh use master as default branch
2014-06-02 18:02:34 -07:00
don bright
1ee5f18794
change gettext detection (libintl is part of gnu libc not gettext?)
2014-06-02 17:38:24 -07:00
don bright
958345a0a5
change gettext detection (libintl is part of gnu libc not gettext). also
...
disable native java in gettext. disable redundant glib build.
2014-06-02 17:15:19 -07:00
don bright
19d3ba0d96
change gettext-tarball-existance test to use .gz not .xz, since the
...
download/unpack use gz (and gz is more portable than xz)
2014-06-02 16:14:13 -07:00
don bright
eb45f9bc36
more documentation of scripts. disable java for gettext. disable docs for fontconfig
2014-06-02 16:12:54 -07: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
a633c9c650
#567 Exclude the last remaining test until improved GL drivers can be used on Travis VMs
2014-05-28 20:49:27 -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