diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-07-24 11:27:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-07-25 00:37:59 +0100 |
| commit | 411855eb8d9bf373ecf406529b034b457d663a21 (patch) | |
| tree | c490367c6aab1b0f4484fed9756c908173d38b7c | |
| parent | e36211226b83417796a90c8e3340efa9af995ad2 (diff) | |
Removing explicit link with libbfd and libiberty.
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 | ||||
| -rw-r--r-- | test/wscript | 2 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 3 insertions, 5 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') diff --git a/test/wscript b/test/wscript index e4a391f8b..bf22575f3 100644 --- a/test/wscript +++ b/test/wscript @@ -36,7 +36,7 @@ def build(bld): obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP ' obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE ' if bld.env.TARGET_WINDOWS: - obj.uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE ' + obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE ' obj.use = 'libdcpomatic2' obj.source = """ 4k_test.cc @@ -111,9 +111,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-mconsole']) conf.env.append_value('LINKFLAGS', ['-mconsole']) conf.check(lib='ws2_32', uselib_store='WINSOCK2', msg="Checking for library winsock2") - conf.check(lib='bfd', uselib_store='BFD', msg="Checking for library bfd") conf.check(lib='dbghelp', uselib_store='DBGHELP', msg="Checking for library dbghelp") - conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty") conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi") conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock") conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32") |