diff options
| author | Marius Kintel <marius@kintel.net> | 2012-10-23 01:54:07 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-10-23 02:05:25 (GMT) |
| commit | dadde5d754191cc0cc430d3079d8811147db4bc1 (patch) | |
| tree | e55a5a30253a364ddc59489fbc20a6b1c0fd8003 | |
| parent | ed27859e65b46a63a7dbd48227643b5e5b528f08 (diff) | |
Minor clang updates
Conflicts:
scripts/macosx-build-dependencies.sh
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 9 | ||||
| -rw-r--r-- | setenv_mac-clang.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index b7bd2bd..f6b8161 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -212,8 +212,9 @@ build_cgal() cd $BASEDIR/src rm -rf CGAL-$version if [ ! -f CGAL-$version.tar.gz ]; then - # 4.0.2 - curl -O https://gforge.inria.fr/frs/download.php/31175/CGAL-$version.tar.gz + # 4.1-beta1 + curl -O https://gforge.inria.fr/frs/download.php/31348/CGAL-$version.tar.gz + # 4.0.2 curl -O https://gforge.inria.fr/frs/download.php/31175/CGAL-$version.tar.gz # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz @@ -372,8 +373,8 @@ mkdir -p $SRCDIR $DEPLOYDIR build_eigen 3.1.1 build_gmp 5.0.5 build_mpfr 3.1.1 -build_boost 1.50.0 +build_boost 1.51.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 4.0.2 +build_cgal 4.1-beta1 build_glew 1.9.0 build_opencsg 1.3.2 diff --git a/setenv_mac-clang.sh b/setenv_mac-clang.sh index 9a42dce..2bc9234 100644 --- a/setenv_mac-clang.sh +++ b/setenv_mac-clang.sh @@ -1,4 +1,4 @@ -export OPENSCAD_LIBRARIES=$PWD/../libraries/install-clang +export OPENSCAD_LIBRARIES=$PWD/../libraries/install export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib export QMAKESPEC=unsupported/macx-clang |