summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-09-27 19:57:14 +0000
committerDavid Robillard <d@drobilla.net>2011-09-27 19:57:14 +0000
commitdced6dde703f2cf7fc2980507139d67f6d5dcc9c (patch)
tree1fe6a161b80dffc1f66883d3e463e5a6b6517324 /wscript
parent40a46333d16f4d4857c746044691b844c18c56a1 (diff)
downloadraul-dced6dde703f2cf7fc2980507139d67f6d5dcc9c.tar.gz
raul-dced6dde703f2cf7fc2980507139d67f6d5dcc9c.tar.bz2
raul-dced6dde703f2cf7fc2980507139d67f6d5dcc9c.zip
Load tools before autowaf.configure so e.g. --debug works correctly.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3497 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript b/wscript
index 6d5bf90..9e79b18 100644
--- a/wscript
+++ b/wscript
@@ -35,8 +35,8 @@ top = '.'
out = 'build'
def options(opt):
- autowaf.set_options(opt)
opt.load('compiler_cxx')
+ autowaf.set_options(opt)
opt.add_option('--test', action='store_true', default=False, dest='build_tests',
help="Build unit tests")
opt.add_option('--log-colour', action='store_true', default=True, dest='log_colour',
@@ -47,10 +47,10 @@ def options(opt):
help="Use C++0x smart pointers instead of boost")
def configure(conf):
+ conf.load('compiler_cxx')
autowaf.configure(conf)
conf.line_just = 40
autowaf.display_header('Raul Configuration')
- conf.load('compiler_cxx')
autowaf.check_pkg(conf, 'glib-2.0', atleast_version='2.2',
uselib_store='GLIB', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', atleast_version='2.14.0',