Build fixes.

diff --git a/cscript b/cscript
index aa274e8ecef8bf0362e4a97dea2471b9ba4090e9..a985fa940110a440e3e67a2ad93a01357643819f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -337,7 +337,9 @@ def configure_options(target, options):
     if target.debug:
         opt += ' --enable-debug'
     if target.platform == 'windows':
-        opt += ' --target-windows'
+        opt += ' --target-windows --disable-tests'
+    elif target.platform == 'osx':
+        opt += ' --disable-tests'
     elif target.platform == 'linux':
         opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':

diff --git a/src/lib/wscript b/src/lib/wscript
index 75e122e289c6ed1e09e7ba551f3f750de04fb825..6d67fa4fe663930ba2dd72e639d3a3cbcd9d88c8 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -178,7 +178,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
                  SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE
+                 CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG
                  """
 
     if bld.env.TARGET_OSX:

diff --git a/wscript b/wscript
index f7bfea42faf80612bc064f14ba66118e3051581a..76aefd277d404cc546a0cb73460659aad9747803 100644 (file)
--- a/wscript
+++ b/wscript
@@ -337,6 +337,9 @@ def configure(conf):
     # nettle
     conf.check_cfg(package="nettle", args='--cflags --libs', uselib_store='NETTLE', mandatory=True)
 
+    # libpng
+    conf.check_cfg(package='libpng', args='--cflags --libs', uselib_store='PNG', mandatory=True)
+
     # FFmpeg
     if conf.options.static_ffmpeg:
         names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc', 'swresample']
@@ -417,7 +420,7 @@ def configure(conf):
                    mandatory=False)
 
     # Hack: the previous two check_cxx calls end up copying their (necessary) cxxflags
-    # to these variables.  We don't want to use these for the actual build, so clearn them out.
+    # to these variables.  We don't want to use these for the actual build, so clean them out.
     conf.env['CXXFLAGS_AVCODEC'] = []
     conf.env['CXXFLAGS_AVUTIL'] = []