summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-04-21 20:25:10 +0200
committerDavid Robillard <d@drobilla.net>2019-04-21 22:44:20 +0200
commit0a0eb91349101d6e73a1bd83491f7d4dc993723e (patch)
treef4cb9ea615c2d9435679e363559e9367eac9ab06 /wscript
parentf48f9d69a541d758dc9928c0c89eae46819e660f (diff)
downloadingen-0a0eb91349101d6e73a1bd83491f7d4dc993723e.tar.gz
ingen-0a0eb91349101d6e73a1bd83491f7d4dc993723e.tar.bz2
ingen-0a0eb91349101d6e73a1bd83491f7d4dc993723e.zip
Switch to using a submodule for autowaf
Diffstat (limited to 'wscript')
-rw-r--r--wscript14
1 files changed, 7 insertions, 7 deletions
diff --git a/wscript b/wscript
index 7b159563..eac271fc 100644
--- a/wscript
+++ b/wscript
@@ -71,8 +71,8 @@ def configure(conf):
atleast_version='0.8.7', mandatory=True)
autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
atleast_version='0.4.6', mandatory=True)
- autowaf.check_pkg(conf, 'raul', uselib_store='RAUL',
- atleast_version='0.8.10', mandatory=True)
+ autowaf.check_pkg(conf, 'raul-1', uselib_store='RAUL',
+ atleast_version='1.0.0', mandatory=True)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
atleast_version='0.30.0', mandatory=False)
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
@@ -173,11 +173,11 @@ def configure(conf):
os.path.join(conf.env.LV2DIR, 'ingen.lv2'))
autowaf.set_lib_env(conf, 'ingen', INGEN_VERSION)
- conf.run_env.append_unique('XDG_DATA_DIRS', conf.build_path())
+ conf.run_env.append_unique('XDG_DATA_DIRS', [str(conf.path.get_bld())])
for i in ['src', 'modules']:
- conf.run_env.append_unique(autowaf.lib_path_name, conf.build_path(i))
+ conf.run_env.append_unique(autowaf.lib_path_name, [str(conf.build_path(i))])
for i in ['src/client', 'src/server', 'src/gui']:
- conf.run_env.append_unique('INGEN_MODULE_PATH', conf.build_path(i))
+ conf.run_env.append_unique('INGEN_MODULE_PATH', [str(conf.build_path(i))])
conf.write_config_header('ingen_config.h', remove=False)
@@ -226,8 +226,8 @@ def build(bld):
target = 'ingen',
includes = ['.'],
use = 'libingen',
+ uselib = 'SERD SORD SRATOM RAUL LILV LV2',
install_path = '${BINDIR}')
- autowaf.use_lib(bld, obj, 'SORD RAUL LILV LV2')
# Test program
if bld.env.BUILD_TESTS:
@@ -237,10 +237,10 @@ def build(bld):
target = 'tests/%s' % i,
includes = ['.'],
use = 'libingen',
+ uselib = 'SERD SORD SRATOM RAUL LILV LV2',
install_path = '',
cxxflags = bld.env.INGEN_TEST_CXXFLAGS,
linkflags = bld.env.INGEN_TEST_LINKFLAGS)
- autowaf.use_lib(bld, obj, 'SORD RAUL LILV LV2 SRATOM')
bld.install_files('${DATADIR}/applications', 'src/ingen/ingen.desktop')
bld.install_files('${BINDIR}', 'scripts/ingenish', chmod=Utils.O755)