2006-03-04 Tim Mayberry <mojofunk@gmail.com>

	* Enable linking to system soundtouch library if SYSLIBS=1, soundtouch-1.3.1 needed for pkgconfig support
	* Fix to allow compiling against libgnomecanvasmm library when SYSLIBS=1

git-svn-id: svn://localhost/trunk/ardour2@354 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 2626554fffe0df29fd9066243471efff2f76c023..c7378dcd709c850e19712c5480b425ee65cd7951 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -435,11 +435,10 @@ if env['SYSLIBS']:
     libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
-    libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
-                                          LIBPATH='#libs/soundtouch',
-                                          CPPPATH=['#libs', '#libs/soundtouch'])
+    libraries['soundtouch'] = LibraryInfo()
+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+
     coredirs = [
-       'libs/soundtouch',
         'templates'
     ]
 

diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index f4676cf69540ef67bce332a4382a5671612f2db8..b4931c94c0b3f3ff5579d54262bccffaa566be6e 100644 (file)
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -22,7 +22,7 @@
 #define __gtk_ardour_crossfade_view_h__
 
 #include <vector>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <sigc++/signal.h>
 #include <ardour/crossfade.h>
 

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index aa7b45f4a986d7732bb403a5b453cc9a1245d42a..3b70286bcc238c962c83f8691a836b61bdca2809 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <climits>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include <pbd/error.h>
 

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 0ca52a70e69a306da88ab7b6ca9831dbf7527594..0255035ea1504f65e290f6c3720f3842d46ee402 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 #include <sigc++/signal.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include "canvas.h"
 #include "simplerect.h"
 

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 5de011cae62b6dc5eae3571a9dad3d96ad0657ba..cefd0c5d097f44333d42c716e4958e1b5a8a852d 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -23,7 +23,7 @@
 
 #include <list>
 
-#include <libgnomecanvas/libgnomecanvas.h>
+//#include <libgnomecanvas.h>
 
 #include "ardour_dialog.h"
 #include "enums.h"

diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h
index e97606d542e70f2bff2c91c727cea21af487124b..d51901d4e08ee4358702f4daa0ea7eb5b3e40e30 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.h
+++ b/gtk2_ardour/imageframe_time_axis_view.h
@@ -28,7 +28,7 @@
 
 #include <jack/jack.h>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include "canvas.h"
 #include "simplerect.h"
 

diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 494dae31471ea921ad23db1c8c9d097e320482c8..bf6de0d8103d96fca526b83f4146cee4c09be69e 100644 (file)
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -2,7 +2,7 @@
 #define __ardour_gtk_region_gain_line_h__
 
 #include <ardour/ardour.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 
 #include "automation_line.h"
 

diff --git a/gtk2_ardour/regionview.h b/gtk2_ardour/regionview.h
index 70c944f2da836803e45212ed6a5bf0ade40d7def..cb71a8f3a789bc7c1cba233b3ae1d194a5a7f114 100644 (file)
--- a/gtk2_ardour/regionview.h
+++ b/gtk2_ardour/regionview.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
 #include <ardour/region.h>

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 24e3b558372ebab587dfba0914f8ba46662ee680..add01e257227f1c8c7266eb8f6a7d54f0840b911 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
+#include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/canvas.h>
 #include <libgnomecanvasmm/item.h>