aboutsummaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-03-15 22:41:56 +0000
committerDavid Robillard <d@drobilla.net>2011-03-15 22:41:56 +0000
commit27d4d0768d3c15b333b73002e718984a63fb556a (patch)
tree25186b78428476a430deccd90989ba6b2139d19d /wscript
parent7c46b992e3c3d3088a9d49f732ab96b563b6eba5 (diff)
downloadmachina-27d4d0768d3c15b333b73002e718984a63fb556a.tar.gz
machina-27d4d0768d3c15b333b73002e718984a63fb556a.tar.bz2
machina-27d4d0768d3c15b333b73002e718984a63fb556a.zip
Remove autowaf external (broken intermediary revision).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@3095 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
-rw-r--r--wscript23
1 files changed, 12 insertions, 11 deletions
diff --git a/wscript b/wscript
index 40ad4cf..ed946a6 100644
--- a/wscript
+++ b/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import os
-import autowaf
+
+from waflib.extras import autowaf as autowaf
# Version of this package (even if built as a child)
MACHINA_VERSION = '0.5.0'
@@ -19,7 +20,7 @@ def options(opt):
def configure(conf):
autowaf.configure(conf)
autowaf.display_header('Machina Configuration')
- conf.check_tool('compiler_cxx')
+ conf.load('compiler_cxx')
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM',
atleast_version='2.14.0', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
@@ -45,23 +46,23 @@ def configure(conf):
define_name='HAVE_POSIX_MEMALIGN',
mandatory=False)
- build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
-
+ if conf.is_defined('HAVE_GLADEMM') and conf.is_defined('HAVE_FLOWCANVAS'):
+ autowaf.define(conf, 'MACHINA_BUILD_GUI', 1)
+
autowaf.define(conf, 'MACHINA_PPQN', 19200)
autowaf.define(conf, 'MACHINA_VERSION', MACHINA_VERSION)
- autowaf.define(conf, 'MACHINA_BUILD_GUI', int(build_gui))
autowaf.define(conf, 'MACHINA_DATA_DIR', os.path.join(
conf.env['DATADIR'], 'machina'))
conf.write_config_header('machina-config.h', remove=False)
- autowaf.display_msg(conf, "Jack", str(conf.env['HAVE_JACK'] == 1))
- autowaf.display_msg(conf, "GUI", str(conf.env['MACHINA_BUILD_GUI'] == 1))
+ autowaf.display_msg(conf, "Jack", conf.is_defined('HAVE_JACK'))
+ autowaf.display_msg(conf, "GUI", conf.is_defined('MACHINA_BUILD_GUI'))
print('')
def build(bld):
- bld.add_subdirs('src/engine')
- bld.add_subdirs('src/client')
+ bld.recurse('src/engine')
+ bld.recurse('src/client')
- if bld.env['MACHINA_BUILD_GUI']:
- bld.add_subdirs('src/gui')
+ if bld.is_defined('MACHINA_BUILD_GUI'):
+ bld.recurse('src/gui')