aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-09-19 13:55:54 +0200
committerDavid Robillard <d@drobilla.net>2018-09-19 13:55:54 +0200
commit222320e6c93f8dd4b8e5fabab6997e868bddd2ba (patch)
treec073e9c2808ac5e94db9b2fd5a3dda0eb5b46cc9
parente549b7627f333a84651595dce12c96cd79249929 (diff)
downloadpugl-222320e6c93f8dd4b8e5fabab6997e868bddd2ba.tar.gz
pugl-222320e6c93f8dd4b8e5fabab6997e868bddd2ba.tar.bz2
pugl-222320e6c93f8dd4b8e5fabab6997e868bddd2ba.zip
Fix build with Python 2
-rw-r--r--wscript20
1 files changed, 11 insertions, 9 deletions
diff --git a/wscript b/wscript
index 435ef32..8d7f070 100644
--- a/wscript
+++ b/wscript
@@ -127,17 +127,18 @@ def build(bld):
# Shared Library
if bld.env['BUILD_SHARED']:
- bld(**lib_common,
- features = '%s %sshlib' % (lang, lang),
+ bld(features = '%s %sshlib' % (lang, lang),
name = 'libpugl',
- cflags = libflags + ['-DPUGL_SHARED', '-DPUGL_INTERNAL'])
+ cflags = libflags + ['-DPUGL_SHARED', '-DPUGL_INTERNAL'],
+ **lib_common)
# Static library
if bld.env['BUILD_STATIC']:
- bld(**lib_common,
- features = '%s %sstlib' % (lang, lang),
+ bld(features = '%s %sstlib' % (lang, lang),
name = 'libpugl_static',
- cflags = ['-DPUGL_INTERNAL'])
+ cflags = ['-DPUGL_INTERNAL'],
+ **lib_common)
+
if bld.env['BUILD_TESTS']:
test_libs = libs
@@ -151,14 +152,15 @@ def build(bld):
progs += ['pugl_cairo_test']
for prog in progs:
- bld(**common,
- features = 'c cprogram',
+ bld(features = 'c cprogram',
source = '%s.c' % prog,
use = 'libpugl_static',
lib = test_libs,
target = prog,
install_path = '',
- cflags = test_cflags)
+ cflags = test_cflags,
+ **common)
+
if bld.env['DOCS']:
bld(features = 'subst',