build: improve cflags

Author: ObserverOfTime

binding.gyp

@@ -24,30 +24,29 @@
       "defines": [
         "NAPI_VERSION=<(napi_build_version)",
       ],
-      "cflags_cc": [
-        "-std=c++17"
-      ],
       "conditions": [
         ["OS=='mac'", {
           "xcode_settings": {
             "GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
-            "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
+            "CLANG_CXX_LANGUAGE_STANDARD": "<(cxxstd)",
             "MACOSX_DEPLOYMENT_TARGET": "10.9",
           },
         }],
         ["OS=='win'", {
           "msvs_settings": {
             "VCCLCompilerTool": {
               "AdditionalOptions": [
-                "/std:c++17",
+                "/std:<(cxxstd)",
               ],
               "RuntimeLibrary": 0,
             },
           },
         }],
         ["OS == 'linux'", {
           "cflags_cc": [
-            "-Wno-cast-function-type"
+            "-std=<(cxxstd)",
+            "-fvisibility=hidden",
+            "-Wno-cast-function-type",
           ]
         }],
       ]
@@ -62,19 +61,28 @@
         "vendor/tree-sitter/lib/src",
         "vendor/tree-sitter/lib/include",
       ],
-      "cflags": [
-        "-std=c11"
-      ],
       "defines": [
         "_POSIX_C_SOURCE=200112L",
         "_DEFAULT_SOURCE",
-      ]
+      ],
+      "conditions": [
+        ["OS!='win'", {
+          "cflags_c": [
+            "-std=c11",
+          ],
+        }, { # OS == "win"
+          "cflags_c": [
+            "/std:c11",
+          ],
+        }],
+      ],
     }
   ],
   "variables": {
     "runtime%": "node",
     "openssl_fips": "",
     "v8_enable_pointer_compression%": 0,
     "v8_enable_31bit_smis_on_64bit_arch%": 0,
+    "cxxstd%": "<!(node -p \"parseInt(process.env.npm_config_target ?? process.versions.node) > 22 ? 'c++20' : 'c++17'\")",
   }
 }