aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/engine/wscript3
-rw-r--r--src/gui/wscript11
-rw-r--r--wscript7
3 files changed, 9 insertions, 12 deletions
diff --git a/src/engine/wscript b/src/engine/wscript
index be489de..ace721b 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-import Params
import autowaf
def build(bld):
@@ -23,7 +22,7 @@ def build(bld):
SMFDriver.cpp
'''
- obj = bld.create_obj('cpp', 'shlib')
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = core_source
obj.includes = ['.', '..']
obj.name = 'libmachina_engine'
diff --git a/src/gui/wscript b/src/gui/wscript
index 97e7a30..38a69a2 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -1,9 +1,8 @@
#!/usr/bin/env python
-import Params
import autowaf
def build(bld):
- obj = bld.create_obj('cpp', 'shlib')
+ obj = bld.new_task_gen('cxx', 'shlib')
obj.source = '''
EdgeView.cpp
MachinaCanvas.cpp
@@ -29,15 +28,15 @@ def build(bld):
''')
# GUI runtime files
- install_files('DATADIR', 'machina', 'machina.glade')
- install_files('DATADIR', 'machina', 'machina.svg')
+ bld.install_files('${DATADIR}/machina', 'machina.glade')
+ bld.install_files('${DATADIR}/machina', 'machina.svg')
# Executable
- obj = bld.create_obj('cpp', 'program')
+ 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.defines = 'VERSION=\\\"' + bld.env['MACHINA_VERSION'] + '\\\"'
obj.uselib_local = 'libmachina_engine libmachina_gui'
autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS')
diff --git a/wscript b/wscript
index 0ef2f51..791f410 100644
--- a/wscript
+++ b/wscript
@@ -1,6 +1,5 @@
#!/usr/bin/env python
import os
-import Params
import autowaf
# Version of this package (even if built as a child)
@@ -52,14 +51,14 @@ def configure(conf):
autowaf.print_summary(conf)
autowaf.display_header('Machina Configuration')
- autowaf.display_msg("Jack", str(conf.env['HAVE_JACK'] == 1), 'YELLOW')
- autowaf.display_msg("Build GUI", str(conf.env['BUILD_GUI'] == 1), 'YELLOW')
+ autowaf.display_msg(conf, "Jack", str(conf.env['HAVE_JACK'] == 1))
+ autowaf.display_msg(conf, "Build GUI", str(conf.env['BUILD_GUI'] == 1))
print
def build(bld):
bld.add_subdirs('src/engine')
- if bld.env()['BUILD_GUI']:
+ if bld.env['BUILD_GUI']:
bld.add_subdirs('src/gui')
#bld.add_subdirs('src/machina')