Supporters update.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 8313a1f705999e2515a0dd8c876dfe7519f02036..e5164cc52b6303f0b9a2a4ec2e2300159a275f98 100644 (file)
--- a/wscript
+++ b/wscript
@@ -61,7 +61,6 @@ def options(opt):
     opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
     opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile for Windows 64-bit')
     opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile for Windows 32-bit')
-    opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64')
     opt.add_option('--static-dcpomatic',  action='store_true', default=False, help='link to components of DCP-o-matic statically')
     opt.add_option('--static-boost',      action='store_true', default=False, help='link statically to Boost')
     opt.add_option('--static-wxwidgets',  action='store_true', default=False, help='link statically to wxWidgets')
@@ -79,6 +78,7 @@ def options(opt):
     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')
+    opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -102,6 +102,8 @@ def configure(conf):
     else:
         conf.env.INSTALL_PREFIX = conf.options.destdir
 
+    conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE')
+
     # Common CXXFLAGS
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS',
                                        '-D__STDC_LIMIT_MACROS',
@@ -110,24 +112,26 @@ def configure(conf):
                                        '-Wall',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       # These next 5 are for Xcode 15.0.1 with the v2.16.x-era
-                                       # dependencies; maybe they aren't necessary when building
-                                       # v2.1{7,8}.x
                                        '-Wno-error=deprecated',
-                                       '-Wno-deprecated-builtins',
-                                       '-Wno-deprecated-declarations',
-                                       '-Wno-enum-constexpr-conversion',
-                                       '-Wno-deprecated-copy',
                                        # I tried and failed to ignore these with _Pragma
                                        '-Wno-ignored-qualifiers',
                                        '-D_FILE_OFFSET_BITS=64',
                                        '-std=c++11'])
 
+    if conf.options.disable_more_warnings:
+        # These are for Xcode 15.0.1 with the v2.16.x-era
+        # dependencies; maybe they aren't necessary when building
+        # v2.1{7,8}.x
+        conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-builtins',
+                                           '-Wno-deprecated-declarations',
+                                           '-Wno-enum-constexpr-conversion',
+                                           '-Wno-deprecated-copy'])
+
     if conf.options.warnings_are_errors:
         conf.env.append_value('CXXFLAGS', '-Werror')
 
-    if not conf.options.target_macos_arm64:
-        conf.env.append_value('CXXFLAGS', '-msse')
+    if conf.env.SSE:
+        conf.env.append_value('CXXFLAGS', ['-msse', '-mfpmath=sse'])
 
     if conf.options.enable_asan:
         conf.env.append_value('CXXFLAGS', '-fsanitize=address')
@@ -169,7 +173,6 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN')
         conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H')
         conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
-        conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
         conf.env.append_value('CXXFLAGS', '-Wcast-align')
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
@@ -206,7 +209,6 @@ def configure(conf):
 
     # Linux
     if conf.env.TARGET_LINUX:
-        conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
         conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
@@ -217,7 +219,6 @@ def configure(conf):
     if conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
-        conf.env.append_value('LINKFLAGS', '-llzma')
 
     #
     # Dependencies.
@@ -278,6 +279,15 @@ def configure(conf):
                    uselib="ZIP",
                    define_name='DCPOMATIC_HAVE_ZIP_FILE_ADD'
                    )
+    conf.check_cxx(fragment="""
+                            #include <zip.h>
+                            int main() { int error; zip_open("foo", ZIP_RDONLY, &error); }
+                            """,
+                   mandatory=False,
+                   msg="Checking for ZIP_RDONLY",
+                   uselib="ZIP",
+                   define_name='DCPOMATIC_HAVE_ZIP_RDONLY'
+                   )
 
     # libbz2; must be explicitly linked on macOS for some reason
     conf.check_cxx(fragment="""