From e979112c9bddeaa3a61d4eaf1879c7582b5eee04 Mon Sep 17 00:00:00 2001 From: zw7u9tru Date: Fri, 15 Apr 2022 15:26:57 -0700 Subject: [PATCH] take fish for a walk --- .github/workflows/on_tag.yml | 2 +- SCsub | 5 ----- quickjs/quickjs_binder.cpp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/on_tag.yml b/.github/workflows/on_tag.yml index 2f45a94c..3fd76b41 100644 --- a/.github/workflows/on_tag.yml +++ b/.github/workflows/on_tag.yml @@ -16,7 +16,7 @@ jobs: var downloaded_files = []; var seen_completed_wfs = []; var expected_to_see = 7; - while (total_slept < 3600000 && seen_completed_wfs.length < expected_to_see) { + while (total_slept < 7200000 && seen_completed_wfs.length < expected_to_see) { var all_workflows = await github.rest.actions.listWorkflowRunsForRepo({ owner: context.repo.owner, repo: context.repo.repo, diff --git a/SCsub b/SCsub index b44c4cda..b0afd308 100644 --- a/SCsub +++ b/SCsub @@ -72,11 +72,6 @@ if env['tools']: fh.write(base_text.format(*subs)) env_module.add_source_files(env.modules_sources, fn) -if env.msvc: - # MSVC doesn't have clear C standard support, /std only covers C++. - # We apply it to CCFLAGS (both C and C++ code) in case it impacts C features. - env_module.Append(CCFLAGS=["/std:c++latest"]) - env_module.Append(CPPPATH=["#modules/ECMAScript"]) env_module.add_source_files(env.modules_sources, sources) diff --git a/quickjs/quickjs_binder.cpp b/quickjs/quickjs_binder.cpp index e6e0d174..1bd0f12d 100644 --- a/quickjs/quickjs_binder.cpp +++ b/quickjs/quickjs_binder.cpp @@ -1026,7 +1026,7 @@ void QuickJSBinder::add_godot_classes() { } JS_DefinePropertyValueStr(ctx, godot_object, data.jsclass.class_name, data.constructor, flags); if (data.base_class) { - JS_SetPrototype(ctx, data.constructor, data.base_class->constructor); + JS_SetPrototype(ctx, data.prototype, data.base_class->prototype); } else { JS_SetPrototype(ctx, data.prototype, godot_origin_class.prototype); }