diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-16 01:09:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-16 01:09:21 +0000 |
| commit | 27173512f4ea4f2c324b9488180ba7cbd7173ec3 (patch) | |
| tree | 6f96020d56c4fda3fded24e82a61888db1c47cf6 /src/tools | |
| parent | 9bc93a8b7a996916cfa38baab2cbcfc4c5f40af4 (diff) | |
| parent | a01f72d930b18dfef8487303d49be15e3cce7f2a (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/wscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index eb7e8ceec..175cebc96 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -10,9 +10,12 @@ def configure(conf): def build(bld): - uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP XMLPP ' + uselib = 'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP XMLPP SSH ' uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL GLIB CAIROMM PANGOMM MAGICK ' + if bld.env.TARGET_WINDOWS: + uselib += 'WINSOCK2' + for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']: obj = bld(features = 'cxx cxxprogram') obj.uselib = uselib |