summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-12-18 08:01:59 +0000
committerDavid Robillard <d@drobilla.net>2014-12-18 08:01:59 +0000
commitd1252e8dbc8163b18ffc5244b4f67950e23a9264 (patch)
tree46117b6d7b367c90217d4966a5e1fb448a0169d0 /src
parente89a43a5f8f513610e9a1fd9aa3221c7a0e1ae2b (diff)
downloadingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.tar.gz
ingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.tar.bz2
ingen-d1252e8dbc8163b18ffc5244b4f67950e23a9264.zip
Upgrade to waf 1.8.5.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5496 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/server/wscript2
-rw-r--r--src/socket/wscript8
2 files changed, 6 insertions, 4 deletions
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')