Merge branch 'master' into directx-packages

This commit is contained in:
gingerBill
2022-02-16 16:04:20 +00:00
11 changed files with 94 additions and 61 deletions

View File

@@ -3412,12 +3412,18 @@ ProcCallingConvention string_to_calling_convention(String s) {
if (s == "fast") return ProcCC_FastCall;
if (s == "none") return ProcCC_None;
if (s == "naked") return ProcCC_Naked;
if (s == "win64") return ProcCC_Win64;
if (s == "sysv") return ProcCC_SysV;
if (s == "system") {
if (build_context.metrics.os == TargetOs_windows) {
return ProcCC_StdCall;
}
return ProcCC_CDecl;
}
return ProcCC_Invalid;
}