Commit graph

140 commits

Author SHA1 Message Date
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
Marius Kintel
4bd97b936e Bumped eigen to 3.1.2 2012-12-11 21:22:28 +01:00
Marius Kintel
65c5788676 Updated to CGAL-4.1 2012-10-28 14:04:21 -04:00
Marius Kintel
a661315ab2 Boost 1.51 requires chrono for thread 2012-10-26 10:44:50 -04:00
Marius Kintel
85bc16fc9f Initial clang build support
Conflicts:
	scripts/macosx-build-dependencies.sh
2012-10-22 22:07:45 -04:00
Marius Kintel
dadde5d754 Minor clang updates
Conflicts:
	scripts/macosx-build-dependencies.sh
2012-10-22 22:05:25 -04:00
Marius Kintel
ed27859e65 Now builds on clang-4.0 on Mac OS X Lion
Conflicts:
	scripts/macosx-build-dependencies.sh
2012-10-22 22:04:49 -04:00
Marius Kintel
f89b237ab6 Updated mpfr, boost, glew 2012-08-21 21:10:47 -04:00
Marius Kintel
1e56bf65b9 Merge commit '765f1a98dc124e1913b53ea8467908b8b8bda032' 2012-08-20 19:49:00 -04:00
Marius Kintel
8712bea305 Added support for Lion, added option to force LLVM compiler 2012-08-20 08:53:27 -04:00
don bright
1e0ce9e46b alter Mac OSX dependencies build script to get eigen version 3.1.1
This still allows the building of eigen, 2.0.17 just change the version
number at the bottom of the file.

Eigen3 requires an 'out of source' build.
2012-08-19 00:19:25 +02:00
Marius Kintel
4b2b7cb4a1 Upgraded CGAL to 4.0.2 2012-07-29 17:24:56 -04:00
Marius Kintel
821c064f3e sed parameter bug for build_glew(). Fixes #145 2012-07-16 22:12:57 -04:00
Marius Kintel
13557f1f9a Merge branch 'timestamp-cache' 2012-07-14 21:57:55 -04:00
Marius Kintel
38a4585d1a Tweaks for Qt 4.8 and correct mpfr download link 2012-07-09 17:31:29 -04:00
Marius Kintel
6735a8841b Don't build CGAL as debug 2012-05-28 00:30:39 +02:00
Marius Kintel
18529d2f78 Build mpfr with the latest official patches 2012-05-09 13:21:47 -04:00
Marius Kintel
db2d5b3177 Bumped gmp to 5.0.5 2012-05-09 11:12:24 -04:00
Marius Kintel
a1ff48eef9 Fixes to make CGAL-4.0 link correctly on Mac 2012-05-09 10:55:29 -04:00
Marius Kintel
4394c7a030 Upgraded CGAL to 4.0 2012-03-28 00:05:18 +02:00
Marius Kintel
955e0f1344 Added commented-out support for CGAL-4.0beta1 2012-02-19 13:01:36 +01:00
Marius Kintel
a9e7940943 Merged the 64-bit only script back into the main script. Use the -6 option for 64-bit only 2012-02-15 00:14:27 +01:00
Andrew Plumb
b633845e55 EIGEN2DIR and MAC_OSX_VERSION_MIN
Defining EIGEN2DIR in setenv.
Set MAC_OSX_VERSION_MIN=10.5.
2012-02-13 11:22:06 -05:00
Andrew Plumb
c653a961dd Parametrized version-min and added eigen2.
- Made "macosx-version-min" set via MAC_OSX_VERSION_MIN variable.
- Added build-deps for eigen2
- Added EIGEN2DIR to openscad.pro.user
- Unchecked "Use Shadow Build" to build OpenSCAD.app in project
directory.
2012-02-09 21:19:27 -05:00
Andrew Plumb
99633dd0da Conditionally download bundles if they don't exist.
Saves having to re-download the bundles every time, assuming downloaded
successfully the (N-1)th time.
2012-02-08 15:07:55 -05:00
Andrew Plumb
3c428a61ff Replaced user- with PWD-dependent paths 2012-02-06 09:13:11 -05:00
Andrew Plumb
c6807d4c57 Bugs ID'd by Qt Creator & setup for Mac OS X.
- Removing user-dependency in dep-build path.
- QT Creator complains about entries in Preferences.ui
- File opescad.pro.user by QT Creator on Mac OS X 10.7.
2012-02-06 09:12:15 -05:00
Marius Kintel
3072518e83 Updated to gmp-5.0.3 - now works on Mac OS X Lion. Also exit script on any error 2012-02-03 03:29:08 +01:00
Marius Kintel
195137324a Handle internal boost dependencies 2011-12-23 22:00:53 +01:00
Marius Kintel
87ce149df2 Merge branch 'master' into boost_filesystem
Conflicts:
	boost.pri
	tests/CMakeLists.txt
2011-12-19 15:41:11 +01:00
Marius Kintel
b74bb392af generalized MACOSX_DEPLOY_DIR into the platform-independent OPENSCAD_LIBRARIES 2011-12-15 04:59:15 +01:00
Marius Kintel
b3fa4d98a4 Added regex to boost build 2011-12-06 22:34:43 +01:00
Marius Kintel
ae30a79784 Ported from QFileInfo to boost::filesystem 2011-12-06 04:09:39 +01:00
Marius Kintel
e68773df50 Upgraded OpenCSG to 1.3.2 2011-12-03 01:21:44 +01:00
Marius Kintel
1969396b9d Reverted to boost-1.47 for now - 1.48 causes some tests to fail; *_polygon-holes-touch *_polygon-mesh 2011-11-23 14:35:43 +01:00
Marius Kintel
077a914ac6 Upgraded to boost 1.48, added boost filesystem 2011-11-22 12:00:49 +01:00
Marius Kintel
73d0b74cdf Upgraded 3rd party software: gmp-5.0.2, mpfr-3.1.0, glew-1.7.0 2011-11-08 03:33:22 +01:00
Marius Kintel
c407d6bbd1 gmp was specified twice 2011-09-30 02:43:49 +02:00
Marius Kintel
c1fa2f9675 Upgrade to CGAL-3.9 2011-09-29 22:22:49 +02:00
Marius Kintel
3129189342 Use our own boost with CGAL 2011-09-03 06:02:15 +02:00
Marius Kintel
daebff80c7 Apply FBO patch to OpenCSG 2011-08-02 17:42:24 +02:00
Marius Kintel
6882228058 Merge branch 'master' into visitor
Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc
2011-07-31 01:58:51 +02:00
Marius Kintel
09a5fe2cae Updated to latest versions 2011-07-23 23:44:56 +02:00
Marius Kintel
21ac6c05d1 merged in recent changes in master 2011-07-11 03:54:20 +02:00
Marius Kintel
3499fb2fc9 Relocated files 2011-06-06 02:11:13 +02:00
Marius Kintel
2f740380dc Merged with master 2011-04-28 17:36:56 -04:00
Marius Kintel
1f51e279d8 bugfix: 64-bit build of gmp was broken under Leopard, bumped to mpfr 3.0.1 2011-04-19 04:54:56 +02:00
Marius Kintel
d24b3cc84d Ported recent changes to master into the visitor branch 2011-04-12 20:35:44 +02:00
Marius Kintel
36e970bc79 forgot install name of boost_program_options 2011-04-06 18:05:42 +02:00
Marius Kintel
9103d2235c Updated to latest version of 3rd party libs 2011-04-06 15:16:59 +02:00
Marius Kintel
dd73cb94a0 remove existing glew before building 2010-11-17 01:24:24 -05:00
kintel
746159d183 Updated to latest versions
git-svn-id: http://svn.clifford.at/openscad/trunk@570 b57f626f-c46c-0410-a088-ec61d464b74c
2010-10-31 00:30:27 +00:00
kintel
9f6a3da9bd mpft -> 1.3.0, cgal -> 3.6.1
git-svn-id: http://svn.clifford.at/openscad/trunk@567 b57f626f-c46c-0410-a088-ec61d464b74c
2010-07-09 09:35:15 +00:00
kintel
602d493c58 Fixed problems in fat binary build of libgmp and libmpfr
git-svn-id: http://svn.clifford.at/openscad/trunk@552 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-27 23:17:25 +00:00
kintel
9f5e5826c7 Build all dependencies in one go with current architectures and compatibility modes
git-svn-id: http://svn.clifford.at/openscad/trunk@538 b57f626f-c46c-0410-a088-ec61d464b74c
2010-05-09 01:56:03 +00:00