smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Tim Mayberry 2006-03-07 06:23:12 +00:00
parent 17f7ab67ad
commit 874ba08fb4
9 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -435,11 +435,10 @@ if env['SYSLIBS']:
libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
# libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', libraries['soundtouch'] = LibraryInfo()
LIBPATH='#libs/soundtouch', libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
CPPPATH=['#libs', '#libs/soundtouch'])
coredirs = [ coredirs = [
'libs/soundtouch',
'templates' 'templates'
] ]

2
gtk2_ardour/crossfade_view.h
View file

@ -22,7 +22,7 @@
#define __gtk_ardour_crossfade_view_h__ #define __gtk_ardour_crossfade_view_h__
#include <vector> #include <vector>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include <ardour/crossfade.h> #include <ardour/crossfade.h>

2
gtk2_ardour/editor_tempodisplay.cc
View file

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <climits> #include <climits>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include <pbd/error.h> #include <pbd/error.h>

2
gtk2_ardour/ghostregion.h
View file

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include "canvas.h" #include "canvas.h"
#include "simplerect.h" #include "simplerect.h"

2
gtk2_ardour/imageframe_time_axis.h
View file

@ -23,7 +23,7 @@
#include <list> #include <list>
#include <libgnomecanvas/libgnomecanvas.h> //#include <libgnomecanvas.h>
#include "ardour_dialog.h" #include "ardour_dialog.h"
#include "enums.h" #include "enums.h"

2
gtk2_ardour/imageframe_time_axis_view.h
View file

@ -28,7 +28,7 @@
#include <jack/jack.h> #include <jack/jack.h>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include "canvas.h" #include "canvas.h"
#include "simplerect.h" #include "simplerect.h"

2
gtk2_ardour/region_gain_line.h
View file

@ -2,7 +2,7 @@
#define __ardour_gtk_region_gain_line_h__ #define __ardour_gtk_region_gain_line_h__
#include <ardour/ardour.h> #include <ardour/ardour.h>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include "automation_line.h" #include "automation_line.h"

2
gtk2_ardour/regionview.h
View file

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include <libgnomecanvasmm/polygon.h> #include <libgnomecanvasmm/polygon.h>
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include <ardour/region.h> #include <ardour/region.h>

2
gtk2_ardour/time_axis_view.cc
View file

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <list> #include <list>
#include <libgnomecanvasmm/libgnomecanvasmm.h> #include <libgnomecanvasmm.h>
#include <libgnomecanvasmm/canvas.h> #include <libgnomecanvasmm/canvas.h>
#include <libgnomecanvasmm/item.h> #include <libgnomecanvasmm/item.h>