projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix generic GUI for AU.
[ardour.git]
/
libs
/
pbd
/
wscript
diff --git
a/libs/pbd/wscript
b/libs/pbd/wscript
index 6b3e12b5396e9818f680c03c784a5cfc5ee24b57..8f947fbb2658d94887f9ac7d5ec9fddf5c1f77f1 100644
(file)
--- a/
libs/pbd/wscript
+++ b/
libs/pbd/wscript
@@
-34,10
+34,11
@@
libpbd_sources = [
'boost_debug.cc',
'cartesian.cc',
'command.cc',
'boost_debug.cc',
'cartesian.cc',
'command.cc',
+ 'configuration_variable.cc',
'convert.cc',
'controllable.cc',
'controllable_descriptor.cc',
'convert.cc',
'controllable.cc',
'controllable_descriptor.cc',
- 'c
lear_dir
.cc',
+ 'c
rossthread
.cc',
'cpus.cc',
'debug.cc',
'enumwriter.cc',
'cpus.cc',
'debug.cc',
'enumwriter.cc',
@@
-46,7
+47,6
@@
libpbd_sources = [
'epa.cc',
'error.cc',
'ffs.cc',
'epa.cc',
'error.cc',
'ffs.cc',
- 'file_manager.cc',
'file_utils.cc',
'fpu.cc',
'glib_semaphore.cc',
'file_utils.cc',
'fpu.cc',
'glib_semaphore.cc',
@@
-54,10
+54,10
@@
libpbd_sources = [
'locale_guard.cc',
'localtime_r.cc',
'malign.cc',
'locale_guard.cc',
'localtime_r.cc',
'malign.cc',
+ 'md5.cc',
'mountpoint.cc',
'openuri.cc',
'pathexpand.cc',
'mountpoint.cc',
'openuri.cc',
'pathexpand.cc',
- 'pathscanner.cc',
'pbd.cc',
'pool.cc',
'property_list.cc',
'pbd.cc',
'pool.cc',
'property_list.cc',
@@
-68,17
+68,18
@@
libpbd_sources = [
'semutils.cc',
'shortpath.cc',
'signals.cc',
'semutils.cc',
'shortpath.cc',
'signals.cc',
- 'sndfile_manager.cc',
'stacktrace.cc',
'stateful_diff_command.cc',
'stateful.cc',
'strreplace.cc',
'strsplit.cc',
'stacktrace.cc',
'stateful_diff_command.cc',
'stateful.cc',
'strreplace.cc',
'strsplit.cc',
+ 'system_exec.cc',
'textreceiver.cc',
'textreceiver.cc',
+ 'timer.cc',
+ 'timing.cc',
'transmitter.cc',
'undo.cc',
'uuid.cc',
'transmitter.cc',
'undo.cc',
'uuid.cc',
- 'version.cc',
'whitespace.cc',
'xml++.cc',
]
'whitespace.cc',
'xml++.cc',
]
@@
-88,8
+89,6
@@
def options(opt):
def configure(conf):
conf.load('compiler_cxx')
def configure(conf):
conf.load('compiler_cxx')
- autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc',
- 'libpbd', MAJOR, MINOR, MICRO, 'LIBPBD_API', 'pbd/libpbd_visibility.h')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
@@
-105,19
+104,22
@@
def configure(conf):
# Boost headers
autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
# Boost headers
autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
+ if Options.options.dist_target == 'mingw':
+ conf.check(compiler='cxx',
+ lib='ole32',
+ mandatory=True,
+ uselib_store='OLE')
def build(bld):
def build(bld):
-
+
# Make signals_generated.h using signals.py
bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
# Make signals_generated.h using signals.py
bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h')
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
- print('BUILD SHARED LIB')
obj = bld.shlib(features = 'cxx cxxshlib', source=libpbd_sources)
obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ]
else:
obj = bld.shlib(features = 'cxx cxxshlib', source=libpbd_sources)
obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ]
else:
- print('BUILD STATIC LIB')
obj = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
obj.cxxflags = [ '-fPIC' ]
obj.cflags = [ '-fPIC' ]
obj = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
obj.cxxflags = [ '-fPIC' ]
obj.cflags = [ '-fPIC' ]
@@
-126,9
+128,6
@@
def build(bld):
if bld.is_defined('DEBUG_RT_ALLOC'):
obj.source += 'debug_rt_alloc.c'
if bld.is_defined('DEBUG_RT_ALLOC'):
obj.source += 'debug_rt_alloc.c'
- if bld.env['build_target'] != 'mingw':
- obj.source += [ 'crossthread.cc' ]
-
obj.export_includes = ['.']
obj.includes = ['.']
obj.name = 'libpbd'
obj.export_includes = ['.']
obj.includes = ['.']
obj.name = 'libpbd'
@@
-140,11
+139,14
@@
def build(bld):
obj.source += [ 'cocoa_open_uri.mm' ]
obj.uselib += ' OSX'
obj.vnum = LIBPBD_LIB_VERSION
obj.source += [ 'cocoa_open_uri.mm' ]
obj.uselib += ' OSX'
obj.vnum = LIBPBD_LIB_VERSION
- obj.install_path =
os.path.join(bld.env['LIBDIR'], 'ardour3')
+ obj.install_path =
bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
-
+
if bld.env['build_target'] == 'x86_64':
obj.defines += [ 'USE_X86_64_ASM' ]
if bld.env['build_target'] == 'x86_64':
obj.defines += [ 'USE_X86_64_ASM' ]
+ if bld.env['build_target'] == 'mingw':
+ obj.source += [ 'windows_special_dirs.cc' ]
+ obj.uselib += ' OLE'
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests
@@
-155,6
+157,7
@@
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/test_common.cc
test/convert_test.cc
test/filesystem_test.cc
test/test_common.cc
@@
-164,9
+167,9
@@
def build(bld):
testobj.uselib = 'CPPUNIT XML SNDFILE'
testobj.use = 'libpbd'
testobj.name = 'libpbd-tests'
testobj.uselib = 'CPPUNIT XML SNDFILE'
testobj.use = 'libpbd'
testobj.name = 'libpbd-tests'
+ testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt']
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt']
-
-
+
def shutdown():
autowaf.shutdown()
def shutdown():
autowaf.shutdown()