part 2 of 3 of the 2.8 -> 3.0 merge

[ardour.git] / libs / pbd / SConscript

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index a9166d9505a2e46b6d4f15b9cce36082376aa0cc..51a852fd443e925d912386d9285c148697061d3d 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'
 
@@ -20,20 +20,32 @@ pbd.Append(POTFILE=domain + '.pot')
 pbd_files = Split("""
 basename.cc
 base_ui.cc
+command.cc
 convert.cc
+controllable.cc
+enumwriter.cc
 dmalloc.cc
 error.cc
+filesystem.cc
+filesystem_paths.cc
+file_utils.cc
+fpu.cc
+id.cc
 mountpoint.cc
-path.cc
 pathscanner.cc
 pool.cc
 pthread_utils.cc
 receiver.cc
+search_path.cc
+shortpath.cc
 stacktrace.cc
+stateful.cc
+strreplace.cc
 strsplit.cc
 textreceiver.cc
 transmitter.cc
 undo.cc
+uuid.cc
 version.cc
 whitespace.cc
 xml++.cc
@@ -46,9 +58,17 @@ if conf.CheckCHeader('execinfo.h'):
     conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
 pbd = conf.Finish()
 
-pbd.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ])
+pbd.Merge ([ libraries['sigc2'],
+             libraries['xml'],
+             libraries['uuid'],
+             libraries['glibmm2'],
+             libraries['glib2'],
+             libraries['boost'] ])
 
-pbd.VersionBuild(['version.cc','pbd/version.h'], 'SConscript')
+if pbd['VST']:
+    pbd.Append(CCFLAGS="-DWINE_THREAD_SUPPORT", CPPPATH="#libs/fst")
+
+pbd.VersionBuild(['version.cc','pbd/version.h'], [])
 
 libpbd = pbd.SharedLibrary('pbd', pbd_files)
 Default(libpbd)
@@ -59,7 +79,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, 'lib/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' ] +