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

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12414 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 16e33a79a510b39970235bc8f466e3ecf7565d61..80895368fd334002286abcd53b902a706547a756 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -165,6 +165,10 @@ fixup_bundle_environment (int argc, char* argv[])
        
        setenv ("VAMP_PATH", path.c_str(), 1);
 
+       path += dir_path;
+       path += "/../Frameworks";
+       setenv ("SUIL_MODULE_DIR", path.c_str(), 1);
+
        cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
        if (cstr) {
                path = cstr;
@@ -333,6 +337,18 @@ fixup_bundle_environment (int argc, char* argv[])
        
        setenv ("VAMP_PATH", path.c_str(), 1);
 
+       cstr = getenv ("SUIL_MODULE_DIR");
+       if (cstr) {
+               path = cstr;
+               path += ':';
+       } else {
+               path = "";
+       }
+       path += dir_path;
+       path += "/lib";
+       
+       setenv ("SUIL_MODULE_DIR", path.c_str(), 1);
+
        cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
        if (cstr) {
                path = cstr;

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 52b15ca62ce056b625a25d5967869727b7cdb5bf..acd1797d29f41bb3a29bc2f50897f45a8f8f0b17 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -463,6 +463,9 @@ mv $Surfaces/libardour_cp.so* $Libraries
 # VAMP plugins that we use
 cp ../../libs/vamp-plugins/libardourvampplugins.so* $Libraries
 
+# SUIL modules
+cp $GTKROOT/suil-0/libsuil* $Libraries
+
 OURLIBDIR=../../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
 

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index de49ab07374698fe34f3fc61c030f0230b61314b..d74251b67a78ea1ace3005c3fce6b7d1a209a650 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -313,6 +313,9 @@ mv $Surfaces/libardour_cp.dylib $Frameworks
 # VAMP plugins that we use
 cp ../../libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
 
+# SUIL Modules
+cp $HOME/a3/inst/lib/suil-0/libsuil* $Frameworks
+
 while [ true ] ; do 
     missing=false
     for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Plugins/*.so ; do