From: Carl Hetherington <cth@carlh.net>
Date: Wed, 6 Nov 2013 14:46:04 +0000 (+0000)
Subject: Try to fix windows build.
X-Git-Tag: v2.0.48~1203
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=8cc0d5e6eceeafaeba2490e941b1ff73230aa4e5;p=dcpomatic.git

Try to fix windows build.
---

diff --git a/src/lib/wscript b/src/lib/wscript
index e27cf3cc7..f731795c7 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -81,7 +81,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK'
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'
diff --git a/wscript b/wscript
index 5397eda3d..7444a47d3 100644
--- a/wscript
+++ b/wscript
@@ -51,11 +51,12 @@ def configure(conf):
         if conf.options.enable_debug:
             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='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")
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread_win32-mt'