tweaks to packaging to make SUIL (and thus LV2 UI's) work

git-svn-id: svn://localhost/ardour2/branches/3.0@12413 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 284192ede24933fce2e26e3434d3e0b75c94e06f..463fb704828a7e3c54f3eddef4bdc65919c211da 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -182,7 +182,8 @@ fixup_bundle_environment (int, char* [])
        export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources");
 
        export_search_path (dir_path, "LADSPA_PATH", "/../Plugins");
-       export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
+       export_search_path (dir_path, "VAMP_PATH", "/../lib");
+       export_search_path (dir_path, "SUIL_MODULE_DIR", "/../lib");
 
        path = dir_path;
        path += "/../lib/clearlooks";
@@ -262,7 +263,7 @@ fixup_bundle_environment (int, char* [])
                // JACK driver dir
 
                path = dir_path;
-               path += "/../Frameworks";
+               path += "/../lib";
 
                setenv ("JACK_DRIVER_DIR", path.c_str(), 1);
        }
@@ -298,6 +299,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 
        export_search_path (dir_path, "LADSPA_PATH", "/../plugins");
        export_search_path (dir_path, "VAMP_PATH", "/lib");
+       export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
 
        path = dir_path;
        path += "/lib/clearlooks";

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index b930977bbaf20731929c10d6be240f2caf2b2335..ce3d03d07313ab1fe1b7814a77952ca918c8a198 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -505,6 +505,9 @@ cp $BUILD_ROOT/libs/panners/*/lib*.so* $Panners
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries
 
+# SUIL GUI sub-libraries
+cp $HOME/a3/inst/lib/suil-0/lib*.dylib $Libraries
+
 OURLIBDIR=$BUILD_ROOT/libs
 OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/libgnomecanvasmm:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/qm-dsp
 

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 040c4a7ea5b420c1969b440c31e22274a9d117e4..2f51df03a638d0f059c41042253a6d1b0fa26c41 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -349,6 +349,9 @@ done
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
 
+# SUIL Modules
+cp $ARDOURSTACK_ROOT/lib/suil-0/libsuil* $Frameworks
+
 while [ true ] ; do 
     missing=false
     for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Surfaces/*.dylib $Plugins/*.so ; do