diff options
| -rw-r--r-- | src/world.c | 1 | ||||
| -rw-r--r-- | wscript | 24 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/world.c b/src/world.c index 47dc147..0e9bd2e 100644 --- a/src/world.c +++ b/src/world.c @@ -29,7 +29,6 @@ #ifdef LILV_DYN_MANIFEST # include "lv2/dynmanifest/dynmanifest.h" -# include <dlfcn.h> #endif #include <assert.h> @@ -109,6 +109,8 @@ def configure(conf): if conf.env.DOCS: conf.load('sphinx') + conf.env.LILV_MAJOR_VERSION = LILV_MAJOR_VERSION + conf.env.BASH_COMPLETION = not Options.options.no_bash_completion conf.env.BUILD_UTILS = not Options.options.no_utils conf.env.BUILD_SHARED = not Options.options.no_shared @@ -357,7 +359,7 @@ def build(bld): target = 'lilv-%s' % LILV_MAJOR_VERSION, vnum = LILV_VERSION, install_path = '${LIBDIR}', - defines = ['LILV_INTERNAL'], + defines = ['LILV_INTERNAL', 'ZIX_STATIC'], cflags = libflags, lib = lib, uselib = 'SERD SORD SRATOM LV2') @@ -372,7 +374,10 @@ def build(bld): target = 'lilv-%s' % LILV_MAJOR_VERSION, vnum = LILV_VERSION, install_path = '${LIBDIR}', - defines = defines + ['LILV_STATIC', 'LILV_INTERNAL'], + defines = defines + ['LILV_STATIC', + 'LILV_INTERNAL', + 'ZIX_STATIC', + 'ZIX_INTERNAL'], uselib = 'SERD SORD SRATOM LV2') # Python bindings @@ -411,7 +416,7 @@ def build(bld): name = p, target = 'test/%s.lv2/%s' % (p, p), install_path = None, - defines = defines + ['LILV_STATIC'], + defines = defines + ['LILV_STATIC', 'ZIX_STATIC'], cflags = test_cflags, linkflags = test_linkflags, lib = test_libs, @@ -428,7 +433,7 @@ def build(bld): includes = ['.', 'include', './src'], use = 'liblilv_profiled', install_path = None, - defines = defines + ['LILV_STATIC'], + defines = defines + ['LILV_STATIC', 'ZIX_STATIC'], cflags = test_cflags, linkflags = test_linkflags, lib = test_libs, @@ -451,7 +456,11 @@ def build(bld): name = 'liblilv_profiled', target = 'lilv_profiled', install_path = None, - defines = defines + ['LILV_STATIC', 'LILV_INTERNAL'], + defines = defines + ['LILV_STATIC', + 'LILV_INTERNAL', + 'ZIX_STATIC', + 'ZIX_INTERNAL', + ], cflags = test_cflags, linkflags = test_linkflags, lib = test_libs, @@ -475,7 +484,8 @@ def build(bld): defines = (defines + ['LILV_STATIC'] + ['LILV_TEST_BUNDLE=\"%s/\"' % bpath] + - ['LILV_TEST_DIR=\"%s/\"' % testdir]), + ['LILV_TEST_DIR=\"%s/\"' % testdir] + + ['ZIX_STATIC']), cflags = test_cflags, linkflags = test_linkflags) @@ -489,7 +499,7 @@ def build(bld): uselib = 'SERD SORD SRATOM LV2', target = 'test/lilv_cxx_test', install_path = None, - defines = ['LILV_STATIC'], + defines = ['LILV_STATIC', 'ZIX_STATIC'], cxxflags = test_cflags, linkflags = test_linkflags) |