X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=02d95715b719e8d8c174caf92adac21b3929a601;hb=dedac27070ac5ad65265a0db1fa316b3e436cea7;hp=7e9b54d42c2033ad98b47326aec1c30ebe8803a1;hpb=f9778e457adced00b6e94efd157feddf37776ebe;p=dcpomatic.git

diff --git a/wscript b/wscript
index 7e9b54d42..02d95715b 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.59beta3'
+VERSION = '0.68pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -22,7 +22,7 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
+        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         print wxrc
         conf.env.append_value('WINRCFLAGS', wxrc)
@@ -50,21 +50,45 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
-    # Arguments to pkg-config for things that we might want to link statically
-    pkgconfig_args = '--cflags --libs'
-    if conf.options.static:
-        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)
+    if not conf.options.static:
+        conf.check_cfg(package = 'libdcp', atleast_version = '0.34', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        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)
+    else:
+        # This is hackio grotesquio for static builds (ie for .deb packages).  We need to link some things
+        # statically and some dynamically, or things get horribly confused and the dynamic linker (I think)
+        # crashes horribly.  These calls do what the check_cfg calls would have done, but specify the
+        # different bits as static or dynamic as required.  It'll break if you look at it funny, but
+        # I think anyone else who builds would do so dynamically.
+        conf.env.HAVE_DCP = 1
+        conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
+        conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
+        conf.env.HAVE_AVFORMAT = 1
+        conf.env.STLIB_AVFORMAT = ['avformat']
+        conf.env.HAVE_AVFILTER = 1
+        conf.env.STLIB_AVFILTER = ['avfilter', 'swresample']
+        conf.env.HAVE_AVCODEC = 1
+        conf.env.STLIB_AVCODEC = ['avcodec']
+        conf.env.LIB_AVCODEC = ['x264', 'z']
+        conf.env.HAVE_AVUTIL = 1
+        conf.env.STLIB_AVUTIL = ['avutil']
+        conf.env.HAVE_SWSCALE = 1
+        conf.env.STLIB_SWSCALE = ['swscale']
+        conf.env.HAVE_SWRESAMPLE = 1
+        conf.env.STLIB_SWRESAMPLE = ['swresample']
+        conf.env.HAVE_POSTPROC = 1
+        conf.env.STLIB_POSTPROC = ['postproc']
+
+        # This doesn't seem to be set up, and we need it otherwise resampling support
+        # won't be included.  Hack upon a hack, obviously
+        conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1'])
+
     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)
 
@@ -78,9 +102,9 @@ def configure(conf):
 			"""
 
     if conf.options.static:
-        conf.check_cc(fragment  = openjpeg_fragment, msg = 'Checking for library openjpeg', stlib = 'openjpeg', uselib_store = 'OPENJPEG')
+        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 = openjpeg_fragment, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
 
     conf.check_cc(fragment  = """
                               #include <libssh/libssh.h>\n