From 82ab6f73fab060860addb30691d0e926b4723ee2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 7 Feb 2015 01:05:13 +0000 Subject: Demodularize socket stuff. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5535 a436a847-0d15-0410-975c-d299462d15a1 --- src/wscript | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'src/wscript') diff --git a/src/wscript b/src/wscript index 7aad0dae..fbca8fe9 100644 --- a/src/wscript +++ b/src/wscript @@ -1,23 +1,25 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -sources = [ - 'AtomReader.cpp', - 'AtomWriter.cpp', - 'ClashAvoider.cpp', - 'Configuration.cpp', - 'Forge.cpp', - 'LV2Features.cpp', - 'Log.cpp', - 'Resource.cpp', - 'Store.cpp', - 'URIMap.cpp', - 'URIs.cpp', - 'World.cpp', - 'runtime_paths.cpp', -] - def build(bld): + sources = [ + 'AtomReader.cpp', + 'AtomWriter.cpp', + 'ClashAvoider.cpp', + 'Configuration.cpp', + 'Forge.cpp', + 'LV2Features.cpp', + 'Log.cpp', + 'Resource.cpp', + 'Store.cpp', + 'URIMap.cpp', + 'URIs.cpp', + 'World.cpp', + 'runtime_paths.cpp' + ] + if bld.is_defined('HAVE_SOCKET'): + sources += [ 'SocketReader.cpp', 'SocketWriter.cpp' ] + obj = bld(features = 'cxx cxxshlib', source = sources, export_includes = ['..'], @@ -26,7 +28,9 @@ def build(bld): target = 'ingen', vnum = '0.0.0', install_path = '${LIBDIR}', - lib = ['dl']) + lib = ['dl'], + cxxflags = bld.env.PTHREAD_CFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS) autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SERD SORD SRATOM') if bld.env.BUILD_TESTS: @@ -38,6 +42,7 @@ def build(bld): target = 'ingen_profiled', install_path = '', lib = ['dl'] + bld.env.INGEN_TEST_LIBS, - cxxflags = bld.env.INGEN_TEST_CXXFLAGS) + cxxflags = bld.env.PTHREAD_CFLAGS + bld.env.INGEN_TEST_CXXFLAGS, + linkflags = bld.env.PTHREAD_LINKFLAGS) autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SERD SORD SRATOM') -- cgit v1.2.1