From bc89fe0147c04b67141936d109c00dfd4d69cc4b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 12 Dec 2008 14:43:24 +0000 Subject: most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardev_common.sh.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/ardev_common.sh.in') diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 3e223fe8cc..28eaad39c7 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -4,14 +4,18 @@ cd `dirname "$0"`/.. export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour:. export ARDOUR_DATA_PATH=gtk2_ardour:. -export GTK_PATH=libs/clearlooks +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/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_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH -# For the internal clearlooks engine -export GTK_PATH=$PWD/libs/clearlooks:~/.ardour3 EXECUTABLE=gtk2_ardour/ardour-%VERSION% -- cgit v1.2.3