diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-12 22:44:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-12 23:20:18 +0100 |
| commit | 119db8b6f9b8d0bd69d86403d84b4e60aeb86f44 (patch) | |
| tree | 5a884d034e9513fb09995c8170b9f4b43f605b61 | |
| parent | 1e517fcc4eb35f09b7f02f6843be361a62d20ed9 (diff) | |
Build fixes.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | wscript | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -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 75e122e28..6d67fa4fe 100644 --- 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: @@ -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'] = [] |