X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=f3016843469960b50294bef6ea01a93261a8519e;hb=5ae25c7d1d2045f71abaf692beef093561286e8d;hp=87999f7de118b3f57e9004fe20d7dd4e6ef82499;hpb=15b8cca90c9135bf49bdfce08ebd10b92e5a4d0b;p=dcpomatic.git

diff --git a/wscript b/wscript
index 87999f7de..f30168434 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.35pre'
+VERSION = '1.62.1'
 
 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'])
@@ -88,7 +93,7 @@ def configure(conf):
 
     # Dependencies which are dynamically linked everywhere except --static
     # Get libs only when we are dynamically linking
-    conf.check_cfg(package='libdcp',        atleast_version='0.84', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
+    conf.check_cfg(package='libdcp',        atleast_version='0.92', args=pkg_config_args(conf), uselib_store='DCP',  mandatory=True)
     # Remove erroneous escaping of quotes from xmlsec1 defines
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
     conf.check_cfg(package='libcxml',       atleast_version='0.08', args=pkg_config_args(conf), uselib_store='CXML', mandatory=True)
@@ -196,14 +201,6 @@ def configure(conf):
                                 lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                                 uselib_store='BOOST_LOCALE')
 
-    conf.check_cxx(fragment="""
-    			    #include <boost/locale.hpp>\n
-    			    int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
-			    """, msg='Checking for boost locale library',
-                            libpath='/usr/local/lib',
-                            lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
-                            uselib_store='BOOST_LOCALE')
-
     conf.check_cxx(fragment="""
     			    #include <boost/signals2.hpp>\n
     			    int main() { boost::signals2::signal<void (int)> x; }\n