From d1252e8dbc8163b18ffc5244b4f67950e23a9264 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 18 Dec 2014 08:01:59 +0000 Subject: Upgrade to waf 1.8.5. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5496 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/wscript | 2 +- src/socket/wscript | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/wscript b/src/server/wscript index 47090d90..2ab1dfe9 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -70,7 +70,7 @@ def build(bld): cxxflags = bld.env.INGEN_TEST_CXXFLAGS) autowaf.use_lib(bld, obj, core_libs) - if bld.is_defined('HAVE_JACK'): + if bld.env.HAVE_JACK: obj = bld(features = 'cxx cxxshlib', source = 'JackDriver.cpp ingen_jack.cpp', includes = ['.', '../..'], diff --git a/src/socket/wscript b/src/socket/wscript index 488bb7d9..6db7cea2 100644 --- a/src/socket/wscript +++ b/src/socket/wscript @@ -2,7 +2,7 @@ from waflib.extras import autowaf as autowaf def build(bld): - if bld.is_defined('HAVE_SOCKET'): + if bld.env.HAVE_SOCKET: obj = bld(features = 'cxx cxxshlib', source = ['SocketReader.cpp', 'SocketWriter.cpp', @@ -11,7 +11,8 @@ def build(bld): name = 'libingen_socket_server', target = 'ingen_socket_server', install_path = '${LIBDIR}', - use = 'libingen_server') + use = 'libingen_server', + lib = ['pthread']) autowaf.use_lib(bld, obj, 'GLIBMM SERD SORD SRATOM RAUL LV2') obj = bld(features = 'cxx cxxshlib', @@ -22,5 +23,6 @@ def build(bld): name = 'libingen_socket_client', target = 'ingen_socket_client', install_path = '${LIBDIR}', - use = 'libingen_server') + use = 'libingen_server', + lib = ['pthread']) autowaf.use_lib(bld, obj, 'GLIBMM SERD SORD SRATOM RAUL LV2') -- cgit v1.2.1