Add bbt_add that does not take Metric parameter.

[ardour.git] / libs / pbd / SConscript

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index d513dfc7625ac298b8dcb34208d2d32de86c7833..19f6ea65981dff9561223277bd760136e4a2bded 100644 (file)
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env libraries i18n install_prefix')
 
-pbd = env.Copy()
+pbd = env.Clone()
 
 domain = 'libpbd'
 
@@ -31,7 +31,7 @@ filesystem_paths.cc
 file_utils.cc
 fpu.cc
 id.cc
-misc.c
+malign.cc
 mountpoint.cc
 pathscanner.cc
 pool.cc
@@ -46,6 +46,7 @@ strsplit.cc
 textreceiver.cc
 transmitter.cc
 undo.cc
+uuid.cc
 version.cc
 whitespace.cc
 xml++.cc
@@ -60,8 +61,13 @@ pbd = conf.Finish()
 
 pbd.Merge ([ libraries['sigc2'],
              libraries['xml'],
+             libraries['uuid'],
              libraries['glibmm2'],
-             libraries['glib2'] ])
+             libraries['glib2'],
+             libraries['boost'] ])
+
+if pbd['VST']:
+    pbd.Append(CCFLAGS="-DWINE_THREAD_SUPPORT", CPPPATH="#libs/fst")
 
 pbd.VersionBuild(['version.cc','pbd/version.h'], [])
 
@@ -74,7 +80,7 @@ mount_env.Program('mountpoint', 'mountpoint.cc')
 if env['NLS']:
     i18n (pbd, pbd_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpbd))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libpbd))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +