diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-06 14:46:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-06 14:46:04 +0000 |
| commit | 8cc0d5e6eceeafaeba2490e941b1ff73230aa4e5 (patch) | |
| tree | 5c8086869639737d1ff054712ba67f911fce5add | |
| parent | 6b0ffabb2bbb7b0230d1211c4f13db473e66f0ba (diff) | |
Try to fix windows build.
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | wscript | 11 |
2 files changed, 7 insertions, 6 deletions
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++' @@ -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' |