Remove some unused code; add EncryptedKDM::cpl_id().

[libdcp.git] / wscript

diff --git a/wscript b/wscript
index 6d97dde216ea1fe89ac30ea094de04646b6e64cf..2cf0fb69420110a57feb3a755c0a41b83284f816 100644 (file)
--- a/wscript
+++ b/wscript
@@ -36,8 +36,8 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
-    if not conf.env.TARGET_OSX:
-        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter'])
+    if conf.env.TARGET_OSX:
+        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef'])
 
     if conf.options.enable_openmp:
         conf.env.append_value('CXXFLAGS', '-fopenmp')
@@ -62,7 +62,7 @@ def configure(conf):
 
     if conf.options.static:
         conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
-        conf.env.STLIB_OPENJPEG = ['openjpeg']
+        conf.env.STLIB_OPENJPEG = ['openjp2']
         conf.env.HAVE_CXML = 1
         conf.env.STLIB_CXML = ['cxml']
     else: