diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2022-08-10 04:59:38 +0000 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2022-08-10 04:59:38 +0000 |
| commit | 8bc3a8969f4a9c36a888121166abb96f71bce624 (patch) | |
| tree | 51f2b6d36003720f69e3d72a83e4b7b4ed36256a | |
| parent | 0bf046114c38468f55ebc1c04cbab2e41b39c230 (diff) | |
| parent | 483d4df86f3eeb789f53458c7c4cd8cdd201ada9 (diff) | |
| download | gjs-8bc3a8969f4a9c36a888121166abb96f71bce624.tar.gz | |
Merge branch 'mozjs102-msvc' into 'master'
Fix Visual Studio builds after migration to SpiderMonkey 102.x
See merge request GNOME/gjs!789
| -rw-r--r-- | README.MSVC.md | 4 | ||||
| -rw-r--r-- | libgjs-private/gjs-util.c | 6 | ||||
| -rw-r--r-- | meson.build | 1 |
3 files changed, 6 insertions, 5 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/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c index e0033ce3..6e9ffec2 100644 --- a/libgjs-private/gjs-util.c +++ b/libgjs-private/gjs-util.c @@ -142,9 +142,9 @@ void gjs_g_binding_group_bind_full( from_closure = g_cclosure_new(G_CALLBACK(from_callback), from_data, G_CLOSURE_NOTIFY(from_notify)); - return g_binding_group_bind_with_closures(source, source_property, target, - target_property, flags, - to_closure, from_closure); + g_binding_group_bind_with_closures(source, source_property, target, + target_property, flags, + to_closure, from_closure); } #undef G_CLOSURE_NOTIFY 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 |