diff options
| -rw-r--r-- | src/engine/wscript | 10 | ||||
| -rw-r--r-- | src/gui/wscript | 22 | ||||
| -rw-r--r-- | wscript | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/engine/wscript b/src/engine/wscript index 18a2084..747a3ab 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -24,12 +24,12 @@ def build(bld): Evolver.cpp Problem.cpp ''' - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = core_source - obj.export_incdirs = ['.'] - obj.includes = '.' - obj.name = 'libmachina_engine' - obj.target = 'machina_engine' + obj.export_includes = ['.'] + obj.includes = '.' + obj.name = 'libmachina_engine' + obj.target = 'machina_engine' core_libs = 'GLIBMM GTHREAD RAUL REDLANDMM JACK' if bld.env['HAVE_EUGENE']: core_libs += ' EUGENE ' diff --git a/src/gui/wscript b/src/gui/wscript index e3acb24..78e94d9 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -2,7 +2,7 @@ import autowaf def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' EdgeView.cpp MachinaCanvas.cpp @@ -11,11 +11,11 @@ def build(bld): NodeView.cpp ''' - obj.includes = ['.', '..', '../engine'] - obj.export_incdirs = ['.'] - obj.name = 'libmachina_gui' - obj.target = 'machina_gui' - obj.uselib_local = 'libmachina_engine' + obj.includes = ['.', '..', '../engine'] + obj.export_includes = ['.'] + obj.name = 'libmachina_gui' + obj.target = 'machina_gui' + obj.use = 'libmachina_engine' autowaf.use_lib(bld, obj, ''' FLOWCANVAS GLADEMM @@ -34,9 +34,9 @@ def build(bld): # Executable obj = bld.new_task_gen('cxx', 'program') - obj.target = 'machina_gui' - obj.source = 'main.cpp' - obj.includes = ['.', '../engine'] - obj.defines = 'VERSION=\\\"' + bld.env['MACHINA_VERSION'] + '\\\"' - obj.uselib_local = 'libmachina_engine libmachina_gui' + 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 REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS') @@ -10,10 +10,10 @@ APPNAME = 'machina' VERSION = MACHINA_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -56,7 +56,7 @@ def configure(conf): else: conf.define('MACHINA_DATA_DIR', os.path.join(conf.env['DATADIR'], 'machina')) - conf.write_config_header('machina-config.h') + 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['BUILD_MACHINA_GUI'] == 1)) |