most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas...

[ardour.git] / gtk2_ardour / ardev_common.sh.in

diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index fadfb12cb5797de84f1c785948c305845f2a5c4e..28eaad39c7419be4f679ace66e67f45b17e2cf3a 100644 (file)
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -2,15 +2,20 @@ cd `dirname "$0"`/..
 
 #export G_DEBUG=fatal_criticals
 
-export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour
-export GTK_PATH=libs/clearlooks
+export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:.
+export ARDOUR_DATA_PATH=gtk2_ardour:.
+if test -d $HOME/gtk/inst ; then
+    echo USING NEW CLEARLOOKS
+    export GTK_PATH=~/.ardour2:libs/clearlooks-newer
+else
+    echo USING OLD CLEARLOOKS
+    export GTK_PATH=~/.ardour2:libs/clearlooks-older
+fi
+export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
 
-
-export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/cairomm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:libs/cairomm:libs/taglib:libs/evoral:$LD_LIBRARY_PATH
 
 # DYLD_LIBRARY_PATH is for darwin.
-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
-# For the internal clearlooks engine
-export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2
+export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
 
 EXECUTABLE=gtk2_ardour/ardour-%VERSION%