From 07ea59e9285a31eb3f184fec58949d22171c0ca6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 10 Mar 2013 03:29:16 +0000 Subject: [PATCH] special flags for libtiff are for OS X only; removed gtkfilechooserbutton patch from explicit patch list for !OS X git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@14202 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/build-gtk-stack | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/build-gtk-stack b/tools/build-gtk-stack index a63fe74d3a..16e596ae4b 100755 --- a/tools/build-gtk-stack +++ b/tools/build-gtk-stack @@ -294,7 +294,7 @@ if [ x$patch != x ] ; then if uname -a | grep --silent arwin ; then patches=`ls $this_script_dir/current-gtk-patches/*.patch` else - patches="$this_script_dir/current-gtk-patches/gtkrelocation.patch $this_script_dir/current-gtk-patches/gtkfilechooserbutton.patch" + patches="$this_script_dir/current-gtk-patches/gtkrelocation.patch" fi for patch in $patches ; do @@ -378,7 +378,11 @@ fi basic_builder intltool -tar xf $MOD_tiff_local_tarball && (cd $MOD_tiff_unpacked && CFLAGS="$GLOBAL_CFLAGS -DHAVE_APPLE_OPENGL_FRAMEWORK" LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && make && make install) || die "tiff build failed" +if [ x$OSX != x ] ; then + tar xf $MOD_tiff_local_tarball && (cd $MOD_tiff_unpacked && CFLAGS="$GLOBAL_CFLAGS -DHAVE_APPLE_OPENGL_FRAMEWORK" LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && make && make install) || die "tiff build failed" +else + basic_builder libtiff +fi basic_builder libpng basic_builder jpeg