diff options
| author | Brody Kenrick <user.fake@server.userfake> | 2013-12-06 06:46:52 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-08 23:35:36 (GMT) |
| commit | d2575016b989b9cee5b44c29f10a76d84a7bf182 (patch) | |
| tree | f848b5a62a9478472696b40a7f32e3e47602ffe9 /scripts | |
| parent | c0849eb1d3c98db505eec0396c56276a9a35120f (diff) | |
Add in missed glib build dependencies for OS X and unix
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 25 | ||||
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index d4ca1f7..5e26fee 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -285,6 +285,30 @@ build_glew() make GLEW_DEST=$DEPLOYDIR CC=$CC CFLAGS.EXTRA="-no-cpp-precomp -dynamic -fno-common -mmacosx-version-min=$MAC_OSX_VERSION_MIN $GLEW_EXTRA_FLAGS -arch x86_64" LDFLAGS.EXTRA="-mmacosx-version-min=$MAC_OSX_VERSION_MIN $GLEW_EXTRA_FLAGS -arch x86_64" STRIP= install } +build_glib2() +{ + version="$1" + maj_min_version="${version%.*}" #Drop micro + + if [ -e $DEPLOYDIR/lib/glib-2.0 ]; then + echo "glib2 already installed. not building" + return + fi + + echo "Building glib2 $version..." + cd "$BASEDIR"/src + rm -rf "glib-$version" + if [ ! -f "glib-$version.tar.xz" ]; then + curl --insecure -LO "http://ftp.gnome.org/pub/gnome/sources/glib/$maj_min_version/glib-$version.tar.xz" + fi + tar xJf "glib-$version.tar.xz" + cd "glib-$version" + + ./configure --prefix="$DEPLOYDIR" + make -j$NUMCPU + make install +} + build_opencsg() { version=$1 @@ -449,6 +473,7 @@ build_boost 1.54.0 # NB! For CGAL, also update the actual download URL in the function build_cgal 4.3 build_glew 1.10.0 +build_glib2 2.38.1 build_opencsg 1.3.2 if $OPTION_DEPLOY; then # build_sparkle andymatuschak 0ed83cf9f2eeb425d4fdd141c01a29d843970c20 diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 8d912c3..ba328b7 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -409,6 +409,31 @@ build_glew() GLEW_DEST=$DEPLOYDIR $MAKER install } +build_glib2() +{ + version="$1" + maj_min_version="${version%.*}" #Drop micro + + if [ -e $DEPLOYDIR/lib/glib-2.0 ]; then +echo "glib2 already installed. not building" + return +fi + +echo "Building glib2 $version..." + cd "$BASEDIR"/src + rm -rf "glib-$version" + if [ ! -f "glib-$version.tar.xz" ]; then +curl --insecure -LO "http://ftp.gnome.org/pub/gnome/sources/glib/$maj_min_version/glib-$version.tar.xz" + fi +tar xJf "glib-$version.tar.xz" + cd "glib-$version" + + ./configure --prefix="$DEPLOYDIR" + make -j$NUMCPU + make install + +} + build_opencsg() { if [ -e $DEPLOYDIR/lib/libopencsg.so ]; then |