diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
| commit | e8204f55c981493b99814f71a50b3c3d62601032 (patch) | |
| tree | 19e155586aca13839e440a0574ed5aa5cfa4c4d5 /wscript | |
| parent | ae9b0b509787d244366eb8f69bdf9d563b6c6bb6 (diff) | |
| parent | e28def57ff4591f02ca3585a506ea58fbeba5d46 (diff) | |
Merge master.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.58pre' +VERSION = '1.61.2pre' def options(opt): opt.load('compiler_cxx') @@ -15,6 +15,7 @@ def options(opt): opt.add_option('--static', action='store_true', default=False, help='build statically, and link statically to libdcp and FFmpeg') opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') + opt.add_option('--address-sanitizer', action='store_true', default=False, help='build with address sanitizer') def pkg_config_args(conf): if conf.env.STATIC: @@ -43,6 +44,10 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-O2') + if conf.options.address_sanitizer: + conf.env.append_value('CXXFLAGS', ['-fsanitize=address', '-fno-omit-frame-pointer']) + conf.env.append_value('LINKFLAGS', ['-fsanitize=address']) + # Windows-specific if conf.env.TARGET_WINDOWS: conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN']) |