diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-29 21:38:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-29 21:38:08 +0000 |
| commit | bdbb254c18b100f8fa66a3707f6b515309d05685 (patch) | |
| tree | 44606dda0a79df54f758c278c70df06733b28378 /src/lib/wscript | |
| parent | 95f29bc89f860342c100d7609ce5e2e4a138aa8a (diff) | |
| parent | 747fc9e02cb66fb965e23a4cc0464cf7e8bd743d (diff) | |
Merge master.
Diffstat (limited to 'src/lib/wscript')
| -rw-r--r-- | src/lib/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index ebd316a0c..1699c5ec8 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -72,7 +72,7 @@ def build(bld): obj.export_includes = ['..'] obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE - BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 + BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ CURL ZIP QUICKMAIL """ @@ -80,7 +80,7 @@ def build(bld): obj.source = sources + ' version.cc' if bld.env.TARGET_WINDOWS: - obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK' + obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' obj.source += ' stack.cpp' if bld.env.STATIC: obj.uselib += ' XML++' |