Merge branch 'ft2font-improvements' into freethread

QuLogic · QuLogic · commit 8b690efe20e5 · 2024-09-24T04:49:43.000-04:00
diff --git a/src/meson.build b/src/meson.build
@@ -113,10 +113,14 @@ extension_data = {
 if cpp.get_id() == 'msvc'
   # This flag fixes some bugs with the macro processing, namely
   # https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-170#macro-arguments-are-unpacked
-  # It was added in MSVC 2017 version 15.8, and deprecated for `/Zc:preprocessor` in
-  # MSVC 2019 version 16.5, but we currently support any version of MSVC 2019 (vc142),
-  # so we'll stick with the older flag.
-  new_preprocessor = '/experimental:preprocessor'
+  if cpp.has_argument('/Zc:preprocessor')
+    # This flag was added in MSVC 2019 version 16.5, which deprecated the one below.
+    new_preprocessor = '/Zc:preprocessor'
+  else
+    # Since we currently support any version of MSVC 2019 (vc142), we'll stick with the
+    # older flag, added in MSVC 2017 version 15.8.
+    new_preprocessor = '/experimental:preprocessor'
+  endif
 else
   new_preprocessor = []
 endif
