summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-04-23 00:38:14 +0200
committerCarl Hetherington <cth@carlh.net>2024-04-23 00:38:14 +0200
commitff12ccdde76c54d3b9e69799a63750db9edf0023 (patch)
tree80b612214ab04d9a20ccb0f974978ddbc7cdb002
parentab479fa7f20d84ea31ab35c0330f524ac0c48d21 (diff)
Revert "Tweak how lzma is linked."
This reverts commit 604a5f9343eebfa0108a19bb6b8ec60bc81f4819. I don't know why I did this, and it breaks the mac-old (10.8) target as the lzma.5.dylib is not present on those machines.
-rw-r--r--src/lib/wscript2
-rw-r--r--wscript1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript
index 7dd3bfe35..87a1ca787 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -228,7 +228,7 @@ def build(bld):
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
- SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++
+ SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
LIBZ
"""
diff --git a/wscript b/wscript
index f6f73a52a..e5164cc52 100644
--- a/wscript
+++ b/wscript
@@ -219,7 +219,6 @@ def configure(conf):
if conf.env.TARGET_OSX:
conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
- conf.env.append_value('LINKFLAGS', '-llzma')
#
# Dependencies.