Normalize XML property name style, preserving old session loading (on load _ will...

[ardour.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index d8bb19e1fbb39ad7b7868d965855b17e4fc7d9a3..161cc11c6771a7e693216ccaa9e5df7966ef3f8d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -452,10 +452,10 @@ deps = \
        'lrdf'                 : '0.4.0',
        'jack'                 : '0.109.0',
        'libgnomecanvas-2.0'   : '2.0',
-        'aubio'                : '0.3.2',
-        'ogg'                  : '1.1.2',
-        'flac'                 : '1.2.1',
-        'sndfile'              : '1.0.18'
+       'aubio'                : '0.3.2',
+       'ogg'                  : '1.1.2',
+       'flac'                 : '1.2.1',
+       'sndfile'              : '1.0.18'
 }
 
 def DependenciesRequiredMessage():
@@ -506,12 +506,6 @@ libraries = { }
 
 libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
 
-libraries['flac'] = LibraryInfo ()
-libraries['flac'].ParseConfig ('pkg-config --cflags --libs flac')
-
-libraries['ogg'] = LibraryInfo ()
-libraries['ogg'].ParseConfig ('pkg-config --cflags --libs ogg')
-
 libraries['sndfile'] = LibraryInfo()
 libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
 
@@ -596,6 +590,9 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0')
 libraries['xslt'] = LibraryInfo()
 libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
 
+libraries['uuid'] = LibraryInfo()
+libraries['uuid'].ParseConfig('pkg-config --cflags --libs uuid')
+
 libraries['glib2'] = LibraryInfo()
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0')
 libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')
@@ -628,6 +625,7 @@ libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/
 
 libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour')
 libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2')
+libraries['evoral'] = LibraryInfo (LIBS='evoral', LIBPATH='#libs/evoral', CPPPATH='#libs/evoral')
 libraries['pbd']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd')
 libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
 
@@ -1056,6 +1054,8 @@ 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['taglib'] = LibraryInfo()
+    libraries['taglib'].ParseConfig ('pkg-config --cflags --libs taglib')
 
 #    libraries['libglademm'] = LibraryInfo()
 #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
@@ -1071,8 +1071,8 @@ if env['SYSLIBS']:
                                             CPPPATH='#libs/appleutility')
     
     libraries['sndfile'] = LibraryInfo()
-    libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs libsndfile')
-
+    libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
+    
     coredirs = [
         'templates',
         'manual'
@@ -1081,6 +1081,7 @@ if env['SYSLIBS']:
     subdirs = [
         'libs/pbd',
         'libs/midi++2',
+        'libs/evoral',
         'libs/ardour',
         'libs/vamp-sdk',
         'libs/vamp-plugins/',
@@ -1157,6 +1158,7 @@ else:
         'libs/taglib',
         'libs/pbd',
         'libs/midi++2',
+        'libs/evoral',
         'libs/ardour',
         'libs/vamp-sdk',
         'libs/vamp-plugins/',