Try to fix windows build.
authorCarl Hetherington <cth@carlh.net>
Wed, 6 Nov 2013 14:46:04 +0000 (14:46 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 6 Nov 2013 14:46:04 +0000 (14:46 +0000)
src/lib/wscript
wscript

index e27cf3cc7c06ae045a7b9fa024177224ea679f6e..f731795c760175b61354239ad5297410e38df0a2 100644 (file)
@@ -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 5397eda3dc5aa161313ae1e4c6998684ad01cbe9..7444a47d383fd761aa67056693564ac1577a49ce 100644 (file)
--- 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'