diff options
| l--------- | INSTALL | 1 | ||||
| -rw-r--r-- | src/client/wscript | 2 | ||||
| -rw-r--r-- | src/engine/wscript | 2 | ||||
| -rw-r--r-- | src/gui/wscript | 2 | ||||
| l--------- | waf | 1 | ||||
| -rw-r--r-- | wscript | 23 |
6 files changed, 15 insertions, 16 deletions
diff --git a/INSTALL b/INSTALL deleted file mode 120000 index 4d35fcc..0000000 --- a/INSTALL +++ /dev/null @@ -1 +0,0 @@ -autowaf/INSTALL
\ No newline at end of file diff --git a/src/client/wscript b/src/client/wscript index 03082cc..a04a02e 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): obj = bld(features = 'cxx cxxshlib') diff --git a/src/engine/wscript b/src/engine/wscript index a21b964..f4f8e82 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): core_source = ''' diff --git a/src/gui/wscript b/src/gui/wscript index 8917642..930a0e0 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf def build(bld): obj = bld(features = 'cxx cxxshlib') @@ -1 +0,0 @@ -autowaf/waf
\ No newline at end of file @@ -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') |