summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2022-08-02 16:06:56 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2022-08-09 14:24:17 +0800
commitfc79aaf5966ccc3846ae3dba0b0b436ba680aaf8 (patch)
tree2eca911d0f39f3c6975d38d84a99c8bf3abd687b
parent0bf046114c38468f55ebc1c04cbab2e41b39c230 (diff)
downloadgjs-fc79aaf5966ccc3846ae3dba0b0b436ba680aaf8.tar.gz
build: Require Visual Studio 2019 16.5.x or later
We need to use the newer preprocessor that has been made official in Visual Studio 2019 16.5.x or later in order to consume the Spidermonkey 102 headers.
-rw-r--r--README.MSVC.md4
-rw-r--r--meson.build1
2 files changed, 3 insertions, 2 deletions
diff --git a/README.MSVC.md b/README.MSVC.md
index b5f54349..df640ce4 100644
--- a/README.MSVC.md
+++ b/README.MSVC.md
@@ -1,8 +1,8 @@
Instructions for building GJS on Visual Studio or clang-cl
==========================================================
Building the GJS on Windows is now supported using Visual Studio
-versions 2019 or later with or without clang-cl in both 32-bit and
-64-bit (x64) flavors, via Meson. It should be noted that a
+versions 2019 16.5.x or later with or without clang-cl in both 32-bit
+and 64-bit (x64) flavors, via Meson. It should be noted that a
recent-enough Windows SDK from Microsoft is still required if using
clang-cl, as we will still use items from the Windows SDK.
diff --git a/meson.build b/meson.build
index e9b69e91..86c6bb44 100644
--- a/meson.build
+++ b/meson.build
@@ -40,6 +40,7 @@ if cc.get_id() == 'msvc'
add_project_arguments(cxx.get_supported_arguments([
'-utf-8', # Use UTF-8 mode
'/Zc:externConstexpr', # Required for 'extern constexpr' on MSVC
+ '/Zc:preprocessor', # Required to consume the mozjs-102 headers on MSVC
# Ignore spurious compiler warnings for things that GLib and SpiderMonkey
# header files commonly do