diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-25 14:08:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-25 14:08:59 +0100 |
| commit | c982ff2fe7a956a79c4e935d78ed6b2c37752d75 (patch) | |
| tree | 6e3ad04f567e2944b47ef0fe10eccc24200b8c6b | |
| parent | 6bdf59318f3329fde249e37c48751d1e7a592a97 (diff) | |
More build fixes.
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 | ||||
| -rw-r--r-- | test/wscript | 2 | ||||
| -rw-r--r-- | wscript | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index b615b575d..3daf3ecf4 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -143,7 +143,7 @@ def build(bld): AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SNDFILE SAMPLERATE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ - CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB UCHARDET + CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU """ if bld.env.TARGET_OSX: diff --git a/src/tools/wscript b/src/tools/wscript index b01eee7ca..72d8ac9a8 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -29,7 +29,7 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX ' - uselib += 'UCHARDET ' + uselib += 'ICU ' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' diff --git a/test/wscript b/test/wscript index a92e344eb..6ee995e36 100644 --- a/test/wscript +++ b/test/wscript @@ -31,7 +31,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP OPENJPEG FONTCONFIG CAIROMM PANGOMM XMLPP ' - obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX UCHARDET ' + obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU ' if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2' obj.use = 'libdcpomatic2' @@ -159,6 +159,9 @@ def configure(conf): else: conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True) + # libicu + conf.check_cfg(package='icu-io', args='--cflags --libs', uselib_store='ICU', mandatory=True) + # libsndfile conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) |