diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-25 00:45:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-25 00:45:16 +0100 |
| commit | bd12168f1381e8e5fb197e5f25cf716fcf012010 (patch) | |
| tree | 9e8923a3caf45500c8a6abbe817e53968b1a8294 /src | |
| parent | 2f0d4805ec5fdd74301a6c69d48cac2aeab97d3a (diff) | |
| parent | 4d15107f730f2bb79ba5bb7cf3d0c4a16064dc5b (diff) | |
Merge mxe branch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 39ebc5af2..7fa32c7e7 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -177,7 +177,7 @@ def build(bld): obj.source = sources + ' version.cc' if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' + obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE' if bld.env.STATIC_DCPOMATIC: obj.uselib += ' XMLPP' diff --git a/src/tools/wscript b/src/tools/wscript index 9e3614082..00f3123c6 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -33,7 +33,7 @@ def build(bld): uselib += 'MAGICK SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO ' if bld.env.TARGET_WINDOWS: - uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' + uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']: obj = bld(features='cxx cxxprogram') |