projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 94886e3b8219bb53a1068984fc747e3f737a5f06..51a852fd443e925d912386d9285c148697061d3d 100644
(file)
--- a/
libs/pbd/SConscript
+++ b/
libs/pbd/SConscript
@@
-6,7
+6,7
@@
import glob
Import('env libraries i18n install_prefix')
Import('env libraries i18n install_prefix')
-pbd = env.C
opy
()
+pbd = env.C
lone
()
domain = 'libpbd'
domain = 'libpbd'
@@
-31,7
+31,6
@@
filesystem_paths.cc
file_utils.cc
fpu.cc
id.cc
file_utils.cc
fpu.cc
id.cc
-misc.c
mountpoint.cc
pathscanner.cc
pool.cc
mountpoint.cc
pathscanner.cc
pool.cc
@@
-46,6
+45,7
@@
strsplit.cc
textreceiver.cc
transmitter.cc
undo.cc
textreceiver.cc
transmitter.cc
undo.cc
+uuid.cc
version.cc
whitespace.cc
xml++.cc
version.cc
whitespace.cc
xml++.cc
@@
-54,12
+54,19
@@
xml++.cc
conf = Configure(pbd)
if conf.CheckFunc('getmntent'):
conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT")
conf = Configure(pbd)
if conf.CheckFunc('getmntent'):
conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT")
+if conf.CheckCHeader('execinfo.h'):
+ conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
pbd = conf.Finish()
pbd.Merge ([ libraries['sigc2'],
libraries['xml'],
pbd = conf.Finish()
pbd.Merge ([ libraries['sigc2'],
libraries['xml'],
+ libraries['uuid'],
libraries['glibmm2'],
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'], [])
pbd.VersionBuild(['version.cc','pbd/version.h'], [])