diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-18 16:44:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-18 16:44:07 +0000 |
| commit | 00a106197a69ec1f5edcbc546b8971cba5730e2c (patch) | |
| tree | b2bf7738d4565bcf75a22f2643fd13367d0a75f2 /SConstruct | |
| parent | 69aef2cd91ff6cc5f0f633eb49ff71be920b7a4b (diff) | |
moved OSC into libardour
git-svn-id: svn://localhost/trunk/ardour2@510 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/SConstruct b/SConstruct index f8093e4f6f..19decf99b8 100644 --- a/SConstruct +++ b/SConstruct @@ -390,9 +390,6 @@ libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') libraries['libgnomecanvas2'] = LibraryInfo() libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0') -libraries['glade2'] = LibraryInfo() -libraries['glade2'].ParseConfig ('pkg-config --cflags --libs libglade-2.0') - #libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour') @@ -424,10 +421,9 @@ libraries['usb'] = conf.Finish () libraries['lo'] = LibraryInfo () conf = Configure (libraries['lo']) -if conf.CheckLib ('lo', 'lo_server_new'): - have_liblo = True -else: - have_liblo = False +if conf.CheckLib ('lo', 'lo_server_new') == False: + print "liblo does not appear to be installed." + exit (0) libraries['lo'] = conf.Finish () @@ -486,8 +482,9 @@ if env['SYSLIBS']: libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4') libraries['libgnomecanvasmm'] = LibraryInfo() libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') - libraries['libglademm'] = LibraryInfo() - libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') + +# libraries['libglademm'] = LibraryInfo() +# libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() @@ -535,9 +532,9 @@ else: libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) - libraries['libglademm'] = LibraryInfo(LIBS='libglademm', - LIBPATH='#libs/libglademm', - CPPPATH='#libs/libglademm') +# libraries['libglademm'] = LibraryInfo(LIBS='libglademm', +# LIBPATH='#libs/libglademm', +# CPPPATH='#libs/libglademm') coredirs = [ 'libs/soundtouch', @@ -558,7 +555,6 @@ else: 'libs/gtkmm2/atk', 'libs/gtkmm2/gdk', 'libs/gtkmm2/gtk', - 'libs/libglademm', 'libs/libgnomecanvasmm', # 'libs/flowcanvas', 'libs/gtkmm2ext', @@ -571,8 +567,6 @@ if env['SURFACES']: surface_subdirs += [ 'libs/surfaces/generic_midi' ] if have_libusb: surface_subdirs += [ 'libs/surfaces/tranzport' ] - if have_liblo: - surface_subdirs += [ 'libs/surfaces/osc' ] opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) @@ -850,9 +844,9 @@ for subdir in coredirs: SConscript (subdir + '/SConscript') for sublistdir in [subdirs, gtk_subdirs, surface_subdirs]: - for subdir in sublistdir: - SConscript (subdir + '/SConscript') - + for subdir in sublistdir: + SConscript (subdir + '/SConscript') + # cleanup env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log']) |