diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-07 01:08:51 (GMT) |
| commit | 2c90eaa189cd5bc96ef56e89f2841d36f54d0ae2 (patch) | |
| tree | 9f732cf3913312bfb99dc79253bef906864c34b5 /scripts/macosx-build-dependencies.sh | |
| parent | 750f3c8fc94744d6cc4c62de6ac86595cb2b38b6 (diff) | |
| parent | bb0ec94290733835df0716531c30460fc5b5210a (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Conflicts:
tests/CMakeLists.txt
tests/csgtestcore.cc
Diffstat (limited to 'scripts/macosx-build-dependencies.sh')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 32b15cd..e69d594 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -185,10 +185,10 @@ build_opencsg() version=$1 echo "Building OpenCSG" $version "..." cd $BASEDIR/src + rm -rf OpenCSG-$version curl -O http://www.opencsg.org/OpenCSG-$version.tar.gz tar xzf OpenCSG-$version.tar.gz cd OpenCSG-$version - patch -p1 < $OPENSCADDIR/patches/OpenCSG-$version-FBO.patch patch -p1 < $OPENSCADDIR/patches/OpenCSG-$version-MacOSX-port.patch MACOSX_DEPLOY_DIR=$DEPLOYDIR qmake -r CONFIG+="x86 x86_64" make install @@ -202,4 +202,4 @@ build_boost 1.47.0 # NB! For CGAL, also update the actual download URL in the function build_cgal 3.9 build_glew 1.7.0 -build_opencsg 1.3.0 +build_opencsg 1.3.2 |