Merge branch 'main' into v2.17.x

1 files changed, 9 insertions, 1 deletions

diff --git a/wscript b/wscript
index f6907f3a2..f4e33328f 100644
--- a/wscript
+++ b/wscript
@@ -112,9 +112,16 @@ def configure(conf):
                                        '-Wall',
                                        '-Wextra',
                                        '-Wwrite-strings',
-                                       '-Wno-error=deprecated',
                                        # getMessengerLogger() in the grok code triggers these warnings
                                        '-Wno-nonnull',
+                                       # 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',
@@ -217,6 +224,7 @@ 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.