aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-12-16 04:04:45 +0000
committerDavid Robillard <d@drobilla.net>2010-12-16 04:04:45 +0000
commite0a43e0b891e02529aab179d82d9181a0bb55780 (patch)
tree2ee2d98a9f8b511ab0fc44cd17e51b0a37eaa31b /src
parentcf601c706aaefc5360ec7dd718ca452705effe1e (diff)
downloadmachina-e0a43e0b891e02529aab179d82d9181a0bb55780.tar.gz
machina-e0a43e0b891e02529aab179d82d9181a0bb55780.tar.bz2
machina-e0a43e0b891e02529aab179d82d9181a0bb55780.zip
Updates for waf 1.6.
Note: this revision breaks documentation installation. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2719 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/engine/wscript10
-rw-r--r--src/gui/wscript22
2 files changed, 16 insertions, 16 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')