Support MSVC builds without error in Github Actions.

Co-Authored-By: jaune <[email protected]>

Author: fire

SCsub

@@ -46,16 +46,24 @@ if JS_ENGINE == "quickjs":
     quickjs_env.Append(CPPDEFINES=["CONFIG_BIGNUM"])
     if "release" not in (quickjs_env["target"] or ""):
         quickjs_env.Append(CPPDEFINES={"DUMP_LEAKS": 1})
-        quickjs_env.Append(CPPDEFINES={"QUICKJS_WITH_DEBUGGER": 1})
+        if not env.msvc:
+            env_module.Append(CPPDEFINES={"QUICKJS_WITH_DEBUGGER": 1})
     quickjs_env.Append(CPPPATH=["thirdparty/quickjs/quickjs"])
     quickjs_env.Append(CPPPATH=["thirdparty/quickjs"])
     quickjs_env.disable_warnings()
     if TOOLS:
         quickjs_env.add_source_files(env.modules_sources, "tools/editor_tools.cpp")
     quickjs_env.add_source_files(env.modules_sources, "thirdparty/quickjs/quickjs_builtin_binder.gen.cpp")
     quickjs_env.add_source_files(env.modules_sources, "thirdparty/quickjs/*.cpp")
-    quickjs_env.add_source_files(env.modules_sources, "thirdparty/quickjs/quickjs/*.c")
 
+    env_thirdparty = quickjs_env.Clone()
+    if env.msvc:
+        env_thirdparty.AppendUnique(CCFLAGS=["/TC"])
+
+        # TODO: find a better way to remove /std:c++17
+        del env_thirdparty["CCFLAGS"][0]
+        env_thirdparty.Prepend(CCFLAGS=["/std:c11"])
+    env_thirdparty.add_source_files(env.modules_sources, "thirdparty/quickjs/quickjs/*.c")
 
 # Binding script to run at engine initializing
 with open("misc/godot.binding_script.gen.cpp", "w") as f:

config.py

@@ -1,6 +1,6 @@
 def can_build(env, platform):
-    return not (platform == "windows" and not env["use_mingw"])
-
+    return True
+    
 
 def configure(env):
     pass

register_types.cpp

@@ -52,7 +52,7 @@ class EditorExportJavaScript : public EditorExportPlugin {
 			return;
 		}
 	}
-	virtual String get_name() const override { return "JavaScript"; }
+	virtual String _get_name() const override { return "JavaScript"; }
 };
 
 #endif

thirdparty/quickjs/quickjs/cutils.h

@@ -119,6 +119,53 @@ static inline int64_t min_int64(int64_t a, int64_t b)
         return b;
 }
 
+
+
+#ifdef _MSC_VER
+#include <intrin.h>
+
+static inline int __builtin_ctz(unsigned x)
+{
+    return (int)_tzcnt_u32(x);
+}
+
+static inline int __builtin_ctzll(unsigned long long x)
+{
+#ifdef _WIN64
+    return (int)_tzcnt_u64(x);
+#else
+    return !!unsigned(x) ? __builtin_ctz((unsigned)x) : 32 + __builtin_ctz((unsigned)(x >> 32));
+#endif
+}
+
+static inline int __builtin_ctzl(unsigned long x)
+{
+    return sizeof(x) == 8 ? __builtin_ctzll(x) : __builtin_ctz((unsigned)x);
+}
+
+static inline int __builtin_clz(unsigned x)
+{
+    return (int)_lzcnt_u32(x);
+}
+
+static inline int __builtin_clzll(unsigned long long x)
+{
+#ifdef _WIN64
+    return (int)_lzcnt_u64(x);
+#else
+    return !!unsigned(x >> 32) ? __builtin_clz((unsigned)(x >> 32)) : 32 + __builtin_clz((unsigned)x);
+#endif
+}
+
+static inline int __builtin_clzl(unsigned long x)
+{
+    return sizeof(x) == 8 ? __builtin_clzll(x) : __builtin_clz((unsigned)x);
+}
+#endif
+
+
+
+
 /* WARNING: undefined if a = 0 */
 static inline int clz32(unsigned int a)
 {

thirdparty/quickjs/quickjs/quickjs-debugger.c

@@ -36,12 +36,14 @@ static int js_transport_write_fully(JSDebuggerInfo *info, const char *buffer, si
     return 1;
 }
 
+#define JS_TRANSPORT_WRITE_MESSAGE_NEWLINE_MESSAGE_LENGTH 10
+
 static int js_transport_write_message_newline(JSDebuggerInfo *info, const char* value, size_t len) {
     // length prefix is 8 hex followed by newline = 012345678\n
     // not efficient, but protocol is then human readable.
-    char message_length[10];
+    char message_length[JS_TRANSPORT_WRITE_MESSAGE_NEWLINE_MESSAGE_LENGTH];
     message_length[9] = '\0';
-    sprintf(message_length, "%08x\n", (int)len + 1);
+    sprintf_s(message_length, JS_TRANSPORT_WRITE_MESSAGE_NEWLINE_MESSAGE_LENGTH, "%08x\n", (int)len + 1);
     if (!js_transport_write_fully(info, message_length, 9))
         return 0;
     int ret = js_transport_write_fully(info, value, len);