summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-08-18 17:36:08 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-08-18 17:36:08 +0000
commitb4f417ad43d9f5f296b7e2d3bfea3483ff773a16 (patch)
tree0bb70158c3d645ed9ab0b3122b6459bd0c486f5c
parente626152a22232895357a5e1381e3d49af7b130d5 (diff)
tweaks to the OS X build script to use new GTK stack packaging/install paths
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10007 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rwxr-xr-xtools/osx_packaging/osx_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index aa5d81d940..94257ef6fd 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -249,7 +249,7 @@ cp -R $GTKQUARTZ_ROOT/etc/* $Etc
echo "Copying all Pango modules ..."
cp -R $GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules
echo "Copying all GDK Pixbuf loaders ..."
-cp -R $GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders/*.so $Frameworks/modules
+cp -R $GTKQUARTZ_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Frameworks/modules
# charset alias file
cp -R $GTKQUARTZ_ROOT/lib/charset.alias $Resources
@@ -276,7 +276,7 @@ env PANGO_RC_FILE=pangorc $GTKQUARTZ_ROOT/bin/pango-querymodules | sed "s?$GTKQU
rm pangorc
# generate a new GDK pixbufs loaders file
-sed "s?$GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders/?@executable_path/../Frameworks/modules/?" < $GTKQUARTZ_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders
+gdk-pixbuf-query-loaders | sed "s?$GTKQUARTZ_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/?@executable_path/../Frameworks/modules/?" > $Resources/gdk-pixbuf.loaders
# this one is special - we will set GTK_PATH to $Frameworks/clearlooks
cp ../../libs/clearlooks-newer/libclearlooks.dylib $Frameworks