aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/wscript1
-rw-r--r--wscript11
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/wscript b/src/gui/wscript
index a5a04be..0eef312 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -38,6 +38,5 @@ def build(bld):
obj.target = 'machina_gui'
obj.source = 'main.cpp'
obj.includes = ['.', '../..', '../engine']
- obj.defines = 'VERSION="' + bld.env.MACHINA_VERSION + '"'
obj.use = 'libmachina_engine libmachina_gui'
autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM GTKMM SORD RAUL MACHINA EUGENE GANV LV2')
diff --git a/wscript b/wscript
index c85a8d7..a05613a 100644
--- a/wscript
+++ b/wscript
@@ -1,8 +1,9 @@
#!/usr/bin/env python
+
import os
import subprocess
-from waflib.extras import autowaf as autowaf
+from waflib.extras import autowaf
# Version of this package (even if built as a child)
MACHINA_VERSION = '0.5.0'
@@ -56,16 +57,14 @@ def configure(conf):
autowaf.define(conf, 'MACHINA_BUILD_GUI', 1)
autowaf.define(conf, 'MACHINA_PPQN', 19200)
- autowaf.define(conf, 'MACHINA_VERSION', MACHINA_VERSION)
autowaf.define(conf, 'MACHINA_DATA_DIR',
os.path.join(conf.env.DATADIR, 'machina'))
conf.write_config_header('machina_config.h', remove=False)
- autowaf.display_summary(conf)
- autowaf.display_msg(conf, "Jack", bool(conf.env.HAVE_JACK))
- autowaf.display_msg(conf, "GUI", bool(conf.env.MACHINA_BUILD_GUI))
- print('')
+ autowaf.display_summary(conf,
+ {'Jack': bool(conf.env.HAVE_JACK),
+ 'GUI': bool(conf.env.MACHINA_BUILD_GUI)})
def build(bld):
bld.recurse('src/engine')