Make set_paths.sh work on x86_64 and arm64.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 94ab1fd7047b5ac790588408171d16cd0fd31d34..26859789a568ede1f71ba8de178d94d034c5677f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ except ImportError:
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-libdcp_version = '1.8.68'
+libdcp_version = '1.8.73'
 libsub_version = '1.6.42'
 
 this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
@@ -78,6 +78,7 @@ def options(opt):
     opt.add_option('--enable-disk',       action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
     opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
     opt.add_option('--wx-config',         help='path to wx-config')
+    opt.add_option('--enable-asan',       action='store_true', help='build with asan')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -121,6 +122,10 @@ def configure(conf):
     if not conf.options.target_macos_arm64:
         conf.env.append_value('CXXFLAGS', '-msse')
 
+    if conf.options.enable_asan:
+        conf.env.append_value('CXXFLAGS', '-fsanitize=address')
+        conf.env.append_value('LINKFLAGS', '-fsanitize=address')
+
     if conf.env['CXX_NAME'] == 'gcc':
         gcc = conf.env['CC_VERSION']
         if int(gcc[0]) >= 8:
@@ -148,7 +153,7 @@ def configure(conf):
             pass
 
     #
-    # Windows/Linux/OS X specific
+    # Windows/Linux/macOS specific
     #
 
     # Windows
@@ -249,13 +254,22 @@ def configure(conf):
     conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
     conf.check_cxx(fragment="""
                             #include <zip.h>
-                            int main() { zip_source_t* foo; }
+                            int main() { zip_source_t* foo; (void)foo; }
                             """,
                    mandatory=False,
                    msg="Checking for zip_source_t",
                    uselib="ZIP",
                    define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T'
                    )
+    conf.check_cxx(fragment="""
+                            #include <zip.h>
+                            int main() { struct zip* zip = nullptr; zip_source_t* source = nullptr; zip_file_add(zip, "foo", source, ZIP_FL_ENC_GUESS); }
+                            """,
+                   mandatory=False,
+                   msg="Checking for zip_file_add",
+                   uselib="ZIP",
+                   define_name='DCPOMATIC_HAVE_ZIP_FILE_ADD'
+                   )
 
     # libbz2; must be explicitly linked on macOS for some reason
     conf.check_cxx(fragment="""
@@ -269,6 +283,18 @@ def configure(conf):
                    uselib_store="BZ2"
                    )
 
+    # libz; must be explicitly linked on macOS for some reason
+    conf.check_cxx(fragment="""
+                            #include <zlib.h>
+                            int main() { zlibVersion(); }
+                            """,
+                   mandatory=True,
+                   msg="Checking for libz",
+                   okmsg='yes',
+                   lib='z',
+                   uselib_store="LIBZ"
+                   )
+
     # fontconfig
     conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)
 
@@ -580,7 +606,7 @@ def configure(conf):
     elif conf.env.TARGET_LINUX:
         Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': Linux')
     elif conf.env.TARGET_OSX:
-        Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': OS X')
+        Logs.pprint('YELLOW', '\t' + 'Target'.ljust(25) + ': macOS')
 
     def report(name, variable):
         linkage = ''