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.

diff --git a/src/lib/wscript b/src/lib/wscript
index 7dd3bfe358877f7359f88c7c6e3bee0a06310de2..87a1ca7873bfc37697ac53a7a6f2b9dc67f6fdaa 100644 (file)
--- 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 f6f73a52a132701aa667dfe169270935e817681e..e5164cc52b6303f0b9a2a4ec2e2300159a275f98 100644 (file)
--- 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.