Removing explicit link with libbfd and libiberty.

diff --git a/src/lib/wscript b/src/lib/wscript
index 39ebc5af2cfa6082db1049fe3cba9a267929395f..7fa32c7e7d7d9ebbac0788ba29edd30030168ac8 100644 (file)
--- 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 9e3614082aa1137b28d669827bc8a89135b3eff7..00f3123c66115bfec4dbb1c77eb3b3b567d84b6a 100644 (file)
--- 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 e4a391f8be445d14f553cd9f249ae6d0ea0b9109..bf22575f39334a1ac7d6901c266971dc74915fbd 100644 (file)
--- 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

diff --git a/wscript b/wscript
index 89f2f940786ba1775802d4807dad51309d64ffc0..0d996dd53879191528d93f7dc08aff728086be18 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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")