diff options
| author | David Robillard <d@drobilla.net> | 2008-11-29 03:23:26 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-11-29 03:23:26 +0000 |
| commit | 451e1aabdad810f2410c35436a4e6e43d34904a8 (patch) | |
| tree | 6964369c60da96316597c716e40f3cf36103da98 /src | |
| parent | cbeb8b54ab03592ef2a9b4c8d3670ad009665db4 (diff) | |
| download | machina-451e1aabdad810f2410c35436a4e6e43d34904a8.tar.gz machina-451e1aabdad810f2410c35436a4e6e43d34904a8.tar.bz2 machina-451e1aabdad810f2410c35436a4e6e43d34904a8.zip | |
Upgrade to waf 1.5.0.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@1823 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/wscript | 3 | ||||
| -rw-r--r-- | src/gui/wscript | 11 |
2 files changed, 6 insertions, 8 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') |