summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-03-16 01:16:34 +0000
committerDavid Robillard <d@drobilla.net>2011-03-16 01:16:34 +0000
commit495a596f673dec551783b166150d2fa3772198bd (patch)
tree2e8a392ee9aa98109a9b75caee76861d51d5a50b
parentefad19f9d41d21c8df1ebcb18c101227da642f02 (diff)
downloadingen-495a596f673dec551783b166150d2fa3772198bd.tar.gz
ingen-495a596f673dec551783b166150d2fa3772198bd.tar.bz2
ingen-495a596f673dec551783b166150d2fa3772198bd.zip
Update for new waf/autowaf.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3097 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/client/wscript4
-rw-r--r--src/gui/wscript2
-rw-r--r--src/shared/wscript4
-rw-r--r--wscript7
4 files changed, 8 insertions, 9 deletions
diff --git a/src/client/wscript b/src/client/wscript
index a5120d13..496c7219 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -18,13 +18,13 @@ def build(bld):
ingen_client.cpp
'''
- if bld.env['HAVE_SOUP'] == 1:
+ if bld.is_defined('HAVE_SOUP'):
obj.source += '''
HTTPClientReceiver.cpp
HTTPEngineSender.cpp
'''
- if bld.env['HAVE_LIBLO'] == 1:
+ if bld.is_defined('HAVE_LIBLO'):
obj.source += '''
OSCClientReceiver.cpp
OSCEngineSender.cpp
diff --git a/src/gui/wscript b/src/gui/wscript
index 226a0d08..81965960 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -42,7 +42,7 @@ def build(bld):
ingen_gui.cpp
'''
- if bld.env['HAVE_CURL'] != 0:
+ if bld.is_defined('HAVE_CURL'):
obj.source += 'UploadPatchWindow.cpp'
obj.export_includes = ['.']
diff --git a/src/shared/wscript b/src/shared/wscript
index 067c1335..928a77f8 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -17,9 +17,9 @@ def build(bld):
Store.cpp
runtime_paths.cpp
'''
- if bld.env['HAVE_LIBLO'] == 1:
+ if bld.is_defined('HAVE_LIBLO'):
obj.source += ' OSCSender.cpp '
- if bld.env['HAVE_SOUP'] == 1:
+ if bld.is_defined('HAVE_SOUP'):
autowaf.use_lib(bld, obj, 'SOUP')
obj.source += ' HTTPSender.cpp '
obj.export_includes = ['.']
diff --git a/wscript b/wscript
index 0e5551f1..1017af0b 100644
--- a/wscript
+++ b/wscript
@@ -85,10 +85,9 @@ def configure(conf):
autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-map/uri-map.h')
autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/uri-unmap/uri-unmap.h')
- build_gui = conf.is_defined('HAVE_GLADEMM') and conf.is_defined('HAVE_FLOWCANVAS')
-
autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
- autowaf.define(conf, 'INGEN_BUILD_GUI', int(build_gui))
+ if conf.is_defined('HAVE_GLADEMM') and conf.is_defined('HAVE_FLOWCANVAS'):
+ autowaf.define(conf, 'INGEN_BUILD_GUI', 1)
if conf.is_defined('HAVE_JACK'):
autowaf.define(conf, 'HAVE_JACK_MIDI', 1)
if conf.env['BUNDLE']:
@@ -131,7 +130,7 @@ def build(bld):
bld.recurse('src/shared')
bld.recurse('src/client')
- if bld.env['INGEN_BUILD_GUI']:
+ if bld.is_defined('INGEN_BUILD_GUI'):
bld.recurse('src/gui')
# Program