diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /scripts | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 9a59789..0c2f456 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -119,7 +119,9 @@ build_cgal() version=$1 echo "Building CGAL" $version "..." cd $BASEDIR/src - curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz + rm -rf CGAL* + curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz +# curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz tar xzf CGAL-$version.tar.gz cd CGAL-$version # We build a static lib. Not really necessary, but it's well tested. @@ -160,7 +162,8 @@ echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_gmp 5.0.1 build_mpfr 3.0.1 -build_boost 1.46.1 -build_cgal 3.7 -build_glew 1.5.8 +build_boost 1.47.0 +# NB! For CGAL, also update the actual download URL in the function +build_cgal 3.8 +build_glew 1.6.0 build_opencsg 1.3.0 |