projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parse information from harvid independent from the locale
[ardour.git]
/
libs
/
pbd
/
wscript
diff --git
a/libs/pbd/wscript
b/libs/pbd/wscript
index b12210b54291c458f63276197e18d53e721a469c..6f872c987f301441c2ebe7518e3037403d7bd25e 100644
(file)
--- a/
libs/pbd/wscript
+++ b/
libs/pbd/wscript
@@
-37,10
+37,10
@@
libpbd_sources = [
'configuration_variable.cc',
'convert.cc',
'controllable.cc',
'configuration_variable.cc',
'convert.cc',
'controllable.cc',
- 'controllable_descriptor.cc',
'crossthread.cc',
'cpus.cc',
'debug.cc',
'crossthread.cc',
'cpus.cc',
'debug.cc',
+ 'demangle.cc',
'enumwriter.cc',
'event_loop.cc',
'enums.cc',
'enumwriter.cc',
'event_loop.cc',
'enums.cc',
@@
-49,7
+49,6
@@
libpbd_sources = [
'ffs.cc',
'file_utils.cc',
'fpu.cc',
'ffs.cc',
'file_utils.cc',
'fpu.cc',
- 'glib_semaphore.cc',
'id.cc',
'locale_guard.cc',
'localtime_r.cc',
'id.cc',
'locale_guard.cc',
'localtime_r.cc',
@@
-62,6
+61,7
@@
libpbd_sources = [
'pool.cc',
'property_list.cc',
'pthread_utils.cc',
'pool.cc',
'property_list.cc',
'pthread_utils.cc',
+ 'reallocpool.cc',
'receiver.cc',
'resource.cc',
'search_path.cc',
'receiver.cc',
'resource.cc',
'search_path.cc',
@@
-77,6
+77,7
@@
libpbd_sources = [
'textreceiver.cc',
'timer.cc',
'timing.cc',
'textreceiver.cc',
'timer.cc',
'timing.cc',
+ 'tlsf.cc',
'transmitter.cc',
'undo.cc',
'uuid.cc',
'transmitter.cc',
'undo.cc',
'uuid.cc',
@@
-114,7
+115,7
@@
def configure(conf):
def build(bld):
# Make signals_generated.h using signals.py
def build(bld):
# Make signals_generated.h using signals.py
- bld(rule =
'python
${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
+ bld(rule =
sys.executable + '
${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
@@
-148,6
+149,8
@@
def build(bld):
if bld.env['build_target'] == 'mingw':
obj.defines += [ 'NO_POSIX_MEMALIGN' ]
obj.source += [ 'windows_special_dirs.cc' ]
if bld.env['build_target'] == 'mingw':
obj.defines += [ 'NO_POSIX_MEMALIGN' ]
obj.source += [ 'windows_special_dirs.cc' ]
+ obj.source += [ 'windows_timer_utils.cc' ]
+ obj.source += [ 'windows_mmcss.cc' ]
obj.uselib += ' OLE'
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
obj.uselib += ' OLE'
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@
-159,12
+162,15
@@
def build(bld):
test/mutex_test.cc
test/scalar_properties.cc
test/signals_test.cc
test/mutex_test.cc
test/scalar_properties.cc
test/signals_test.cc
- test/timer_test.cc
test/convert_test.cc
test/filesystem_test.cc
test/convert_test.cc
test/filesystem_test.cc
+ test/natsort_test.cc
+ test/reallocpool_test.cc
test/xml_test.cc
test/test_common.cc
'''.split()
test/xml_test.cc
test/test_common.cc
'''.split()
+ if bld.env['build_target'] == 'mingw':
+ testobj.source += [ 'test/windows_timer_utils_test.cc' ]
testobj.target = 'run-tests'
testobj.includes = obj.includes + ['test', '../pbd']
testobj.uselib = 'CPPUNIT XML SNDFILE'
testobj.target = 'run-tests'
testobj.includes = obj.includes + ['test', '../pbd']
testobj.uselib = 'CPPUNIT XML SNDFILE'
@@
-173,6
+179,6
@@
def build(bld):
testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt']
testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt']
-
+
def shutdown():
autowaf.shutdown()
def shutdown():
autowaf.shutdown()