projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6c5e30
)
When building against macOS SDK 11.0 we need an explicit link with bz2.
author
Carl Hetherington
<cth@carlh.net>
Wed, 23 Dec 2020 19:24:41 +0000
(20:24 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 4 Jan 2021 09:48:59 +0000
(10:48 +0100)
src/lib/wscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 6ea8237287529efef24f553f0f412e68dc02cd4d..bff3382e0f6f9de18d0bc62b2301d502e267a183 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-199,7
+199,7
@@
def build(bld):
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
- CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
+ CURL ZIP
BZ2
FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT
"""
if bld.env.TARGET_OSX:
"""
if bld.env.TARGET_OSX:
diff --git
a/wscript
b/wscript
index 4ad119067fe2cdcef15b52cf5a7f8a9732fd9e69..b7347471967089c5ff7b7b264ab597820cb325ec 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-253,6
+253,18
@@
def configure(conf):
define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
)
define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
)
+ # libbz2; must be explicitly linked on macOS for some reason
+ conf.check_cxx(fragment="""
+ #include <bzlib.h>
+ int main() { BZ2_bzCompressInit(0, 0, 0, 0); }
+ """,
+ mandatory=True,
+ msg="Checking for libbz2",
+ okmsg='yes',
+ lib='bz2',
+ uselib_store="BZ2"
+ )
+
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)