diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
| commit | 8aeb741ccbe2edb528e98a431bf55459a6836a9b (patch) | |
| tree | a14569b531d9867683a1ac1c94c8e0eb406906a8 /src/lib/wscript | |
| parent | 4ba8772aef261da209bbb882325fd61a8b479fd7 (diff) | |
| parent | 22f2cd94132f93a159c2ce9fe263771cb5a5dbdf (diff) | |
Merge master.
Diffstat (limited to 'src/lib/wscript')
| -rw-r--r-- | src/lib/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 8a20618c0..a5b069184 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -69,7 +69,7 @@ sources = """ """ def build(bld): - if bld.env.STATIC: + if bld.env.BUILD_STATIC: obj = bld(features = 'cxx cxxstlib') else: obj = bld(features = 'cxx cxxshlib') @@ -88,7 +88,7 @@ def build(bld): if bld.env.TARGET_WINDOWS: obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' obj.source += ' stack.cpp' - if bld.env.STATIC: + if bld.env.BUILD_STATIC: obj.uselib += ' XML++' obj.target = 'dcpomatic' |