X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=7e9b54d42c2033ad98b47326aec1c30ebe8803a1;hb=31c3f5161bd860dfa4d4b6e152c7b61e23f2189b;hp=21e3ff9a82d7630b2799f1c79d4247d858a73ab6;hpb=c09d415cac646bfd3067f359ca454dc5ea3679e5;p=dcpomatic.git

diff --git a/wscript b/wscript
index 21e3ff9a8..7e9b54d42 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.59beta1'
+VERSION = '0.59beta3'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -20,8 +20,6 @@ def configure(conf):
         conf.load('winres')
 
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
-    # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
-    conf.env.append_value('LIB', 'lzma')
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
@@ -39,6 +37,8 @@ def configure(conf):
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
+        # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
+        conf.env.append_value('LIB', 'lzma')
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
@@ -50,28 +50,37 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
-    conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
-    conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
-    conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
-    conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True)
-    conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True)
-    conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False)
-    conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
-    conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
-    libdcp_args = '--cflags --libs'
+    # Arguments to pkg-config for things that we might want to link statically
+    pkgconfig_args = '--cflags --libs'
     if conf.options.static:
-        libdcp_args += ' --static'
-    conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = libdcp_args, uselib_store = 'DCP', mandatory = True)
+        pkgconfig_args += ' --static'
+
+    conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True)
+    conf.check_cfg(package = 'libavformat', args = pkgconfig_args, uselib_store = 'AVFORMAT', mandatory = True)
+    conf.check_cfg(package = 'libavfilter', args = pkgconfig_args, uselib_store = 'AVFILTER', mandatory = True)
+    conf.check_cfg(package = 'libavcodec', args = pkgconfig_args, uselib_store = 'AVCODEC', mandatory = True)
+    conf.check_cfg(package = 'libavutil', args = pkgconfig_args, uselib_store = 'AVUTIL', mandatory = True)
+    conf.check_cfg(package = 'libswscale', args = pkgconfig_args, uselib_store = 'SWSCALE', mandatory = True)
+    conf.check_cfg(package = 'libswresample', args = pkgconfig_args, uselib_store = 'SWRESAMPLE', mandatory = False)
+    conf.check_cfg(package = 'libpostproc', args = pkgconfig_args, uselib_store = 'POSTPROC', mandatory = True)
+    conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
+    conf.check_cfg(package = 'libdcp', atleast_version = '0.33', args = pkgconfig_args, uselib_store = 'DCP', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
     conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
-    conf.check_cc(fragment  = """
-    			      #include <stdio.h>\n
-			      #include <openjpeg.h>\n
-			      int main () {\n
-			      void* p = (void *) opj_image_create;\n
-			      return 0;\n
-			      }
-			      """, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+
+    openjpeg_fragment = """
+    			#include <stdio.h>\n
+			#include <openjpeg.h>\n
+			int main () {\n
+			void* p = (void *) opj_image_create;\n
+			return 0;\n
+			}
+			"""
+
+    if conf.options.static:
+        conf.check_cc(fragment  = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
+    else:
+        conf.check_cc(fragment  = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
 
     conf.check_cc(fragment  = """
                               #include <libssh/libssh.h>\n