diff options
Diffstat (limited to 'scripts/macosx-build-dependencies.sh')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index a257201..d1c5985 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -8,7 +8,6 @@ # # Usage: macosx-build-dependencies.sh [-6lcd] # -6 Build only 64-bit binaries -# -c Force use of LLVM compiler # -l Force use of LLVM compiler # -c Force use of clang compiler # -d Build for deployment (if not specified, e.g. Sparkle won't be built) @@ -221,7 +220,7 @@ build_boost() BOOST_TOOLSET="toolset=clang" echo "using clang ;" >> tools/build/v2/user-config.jam fi - ./b2 -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" install + ./b2 -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN -arch x86_64 $BOOST_EXTRA_FLAGS -headerpad_max_install_names" install install_name_tool -id $DEPLOYDIR/lib/libboost_thread.dylib $DEPLOYDIR/lib/libboost_thread.dylib install_name_tool -change libboost_system.dylib $DEPLOYDIR/lib/libboost_system.dylib $DEPLOYDIR/lib/libboost_thread.dylib install_name_tool -change libboost_chrono.dylib $DEPLOYDIR/lib/libboost_chrono.dylib $DEPLOYDIR/lib/libboost_thread.dylib @@ -241,8 +240,9 @@ build_cgal() cd $BASEDIR/src rm -rf CGAL-$version if [ ! -f CGAL-$version.tar.gz ]; then - # 4.2 - curl -O https://gforge.inria.fr/frs/download.php/32359/CGAL-$version.tar.gz + # 4.3 + curl -O https://gforge.inria.fr/frs/download.php/32994/CGAL-$version.tar.gz + # 4.2 curl -O https://gforge.inria.fr/frs/download.php/32359/CGAL-$version.tar.gz # 4.1 curl -O https://gforge.inria.fr/frs/download.php/31641/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 @@ -311,7 +311,9 @@ build_eigen() EIGENDIR="none" if [ $version = "2.0.17" ]; then EIGENDIR=eigen-eigen-b23437e61a07; fi if [ $version = "3.1.2" ]; then EIGENDIR=eigen-eigen-5097c01bcdc4; - elif [ $version = "3.1.3" ]; then EIGENDIR=eigen-eigen-2249f9c22fe8; fi + elif [ $version = "3.1.3" ]; then EIGENDIR=eigen-eigen-2249f9c22fe8; + elif [ $version = "3.1.4" ]; then EIGENDIR=eigen-eigen-36bf2ceaf8f5; + elif [ $version = "3.2.0" ]; then EIGENDIR=eigen-eigen-ffa86ffb5570; fi if [ $EIGENDIR = "none" ]; then echo Unknown eigen version. Please edit script. @@ -341,12 +343,13 @@ build_sparkle() # Let Sparkle use the default compiler unset CC unset CXX - version=$1 + github=$1 + version=$2 echo "Building Sparkle" $version "..." cd $BASEDIR/src rm -rf Sparkle-$version if [ ! -f Sparkle-$version.zip ]; then - curl -o Sparkle-$version.zip https://nodeload.github.com/andymatuschak/Sparkle/zip/$version + curl -o Sparkle-$version.zip https://nodeload.github.com/$github/Sparkle/zip/$version fi unzip -q Sparkle-$version.zip cd Sparkle-$version @@ -389,7 +392,7 @@ USING_LLVM=false USING_GCC=false USING_CLANG=false if $OPTION_LLVM; then - USING_LLCM=true + USING_LLVM=true elif $OPTION_GCC; then USING_GCC=true elif $OPTION_CLANG; then @@ -437,14 +440,15 @@ echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_qt 4.8.5 # NB! For eigen, also update the path in the function -build_eigen 3.1.3 -build_gmp 5.1.2 +build_eigen 3.2.0 +build_gmp 5.1.3 build_mpfr 3.1.2 -build_boost 1.53.0 +build_boost 1.54.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 4.2 -build_glew 1.9.0 +build_cgal 4.3 +build_glew 1.10.0 build_opencsg 1.3.2 if $OPTION_DEPLOY; then - build_sparkle 0ed83cf9f2eeb425d4fdd141c01a29d843970c20 +# build_sparkle andymatuschak 0ed83cf9f2eeb425d4fdd141c01a29d843970c20 + build_sparkle Cocoanetics 1e7dcb1a48b96d1a8c62100b5864bd50211cbae1 fi |