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
This commit is contained in:
Paul Davis 2013-03-10 03:29:16 +00:00
parent 845c7072b9
commit 07ea59e928

View file

@ -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