vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
4,495 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

104 Commits (af69e95bbe62cfe06e9f0b4dbbc0b8b197879b5a)

Author SHA1 Message Date
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
Torsten Paul 067c7bd08f Add new libraries to MacOS X build script. 
Also move some general stuff into a separate script so
it can be shared by the MacOS X and the Linux build.
 2014-02-02 18:00:44 -05:00
Torsten Paul 9713a1fefb Patch Qt when building on Mavericks/XCode 5.0.1. 
This is a workaround for compilation problems in that
environment:

- Disable tiff plugin which fails with duplicate symbol
  errors when linking. This is available as configure option.

- Disable core-wlan which fails compilation with lots
  of errors. This needs to patch the qmake config file.
 2014-02-02 18:00:44 -05:00
Torsten Paul 1101d671a1 Skip build in case the library is already installed. 2014-02-02 18:00:44 -05:00
Torsten Paul e6bfee021b Add libffi to MacOS build. 2014-01-08 14:43:04 -05:00
Marius Kintel f093b53c3e Fixed merge error 2014-01-03 00:14:31 -05:00
Marius Kintel 6987ac9279 Merge pull request #561 from brodykenrick/master 
Unicode support for search, length and STRING[] accesses (+ a fix for 3rd Party CGAL lib issue on Ubunti)
 2013-12-10 23:50:52 -08:00
Marius Kintel 379e7a0547 Updated gmp patch. Fixes #558 2013-12-11 00:16:27 -05:00
Marius Kintel 50fb5bb135 Merge branch 'master' of git://github.com/brodykenrick/openscad into brodykenrick-master 
Conflicts:
	scripts/macosx-build-dependencies.sh
	tests/CMakeLists.txt
 2013-12-10 23:09:28 -05:00
Marius Kintel 7cb3ea77ff Build glib2 and gettext on Mac, Find macro for glib2 2013-12-10 23:08:04 -05:00
Brody Kenrick d2575016b9 Add in missed glib build dependencies for OS X and unix 2013-12-08 18:35:36 -05:00
Brody Kenrick a0d8cbe692 Add in missed glib build dependencies for OS X and unix 2013-12-06 18:16:49 +11:00
Marius Kintel 8c060691d7 Update Mac deployment target to make it build on 10.9, apply Qt4 patches 2013-12-05 12:21:10 -05:00
Marius Kintel 3e3caaa625 Removed eigen2 from build system and documentation. We now require eigen3 2013-11-15 15:48:43 -05:00
Marius Kintel e05a9745a3 Bumped to eigen-3.2.0 2013-11-01 11:35:58 -04:00
Marius Kintel 54595cc9bf fix llvm build 2013-10-24 11:32:25 -04:00
Marius Kintel 9a28badc89 updated Sparkle 2013-10-22 02:15:47 -04:00
Marius Kintel 187f656d8d Updated eigen, gmp, boost, cgal and glew 2013-10-22 02:04:35 -04:00
David M. Palmer 31cb13b7ae Mac Build update build to 2013-09 versions 
README.md
   reflect change in setenv_mac*.sh files
macosx-build-dependencies.sh
    qt4 version updated to 4.8.5 and is now at a different host which uses 302 redirection
FindBoost.cmake
    Added paths for MacPorts (/opt/local) and Brew (/usr/local) to previous Fink (/sw/local)
 2013-09-05 21:50:19 -06:00
Marius Kintel c75d195552 clang fixes 2013-06-19 03:48:50 -04:00
Marius Kintel 169e08adce Default to clang for Mac 2013-06-18 01:58:15 -04:00
Marius Kintel 58e09b1351 Bumped CGAL to 4.2m eigen to 3.1.3 and gmp tp 5.1.2 2013-06-08 02:00:35 -04:00
Marius Kintel b5922d7551 Merge branch 'master' into issue116 2013-04-24 02:00:28 -04:00
Marius Kintel f0ee85e17d Better OX version check 2013-04-22 15:18:36 -04:00
Marius Kintel 8bcb17ddfb Build 32-bit binaries only in deployment mode 2013-04-22 13:48:23 -04:00
Marius Kintel d0bd89e6a0 We cannot target 10.5 while building on Mountain lion due to a compiler/sdk incompatibility. This should fix the build error by selecting 10.6 as a build target. Fixes #335 2013-04-22 13:35:05 -04:00
Marius Kintel 49a288cd34 Merge branch 'noqt' into testing 2013-04-10 14:28:51 -04:00
Marius Kintel 3d9a7c91e0 Bumped mpfr to 3.1.2 2013-03-17 17:29:57 -05:00
Marius Kintel ee579894fd Merge branch 'master' of /Users/kintel/code/OpenSCAD/clang/../openscad 2013-03-11 10:24:58 -04:00
Marius Kintel 6a2967a1f4 Qt fixes for clang 2013-03-11 10:24:55 -04:00
Marius Kintel 8711bd2500 Set preprocessor define for deployment builds. Don't include sparkle in development builds. Note: Development snapshots are considered deployment builds 2013-03-09 13:04:36 -05:00
Marius Kintel fe44758f50 Updated gmp to 5.1.1, boost to 1.53, tweaked Sparkle build (again) 2013-03-06 13:08:17 -05:00
Marius Kintel 0498ebbef7 Sparkle build tweak 2013-03-02 22:39:13 +07:00
Marius Kintel 747e52438d Added Sparkle to build script 2013-02-11 19:14:02 -05:00
Marius Kintel 8537dc986c Build our own Qt binaries on Mac, to be able to support 32-bit builds. Upgraded gmp to 5.1.0 2013-01-17 11:37:38 -05:00