Skip to content

Commit b2cacc0

Browse files
committed
Fix gitub actions tests.
1 parent d487bcf commit b2cacc0

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

SCsub

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ if JS_ENGINE == "quickjs":
5151
quickjs_env.Append(CPPPATH=["thirdparty/quickjs/quickjs"])
5252
quickjs_env.Append(CPPPATH=["thirdparty/quickjs"])
5353
quickjs_env.disable_warnings()
54-
if TOOLS:
55-
quickjs_env.add_source_files(env.modules_sources, "tools/editor_tools.cpp")
5654
quickjs_env.add_source_files(env.modules_sources, "thirdparty/quickjs/quickjs_builtin_binder.gen.cpp")
5755
quickjs_env.add_source_files(env.modules_sources, "thirdparty/quickjs/*.cpp")
5856

@@ -83,19 +81,19 @@ if TOOLS:
8381
'/* THIS FILE IS GENERATED DO NOT EDIT */\n#include "editor_tools.h"\nString JavaScriptPlugin::{} = \n{};'
8482
)
8583
tool_fns = {
86-
"tools/godot.d.ts.gen.cpp": (
84+
"editor/godot.d.ts.gen.cpp": (
8785
"BUILTIN_DECLARATION_TEXT",
8886
dump_text_file_to_cpp("misc/godot.d.ts"),
8987
),
90-
"tools/tsconfig.json.gen.cpp": (
88+
"editor/tsconfig.json.gen.cpp": (
9189
"TSCONFIG_CONTENT",
9290
dump_text_file_to_cpp("misc/tsconfig.json"),
9391
),
94-
"tools/decorators.ts.gen.cpp": (
92+
"editor/decorators.ts.gen.cpp": (
9593
"TS_DECORATORS_CONTENT",
9694
dump_text_file_to_cpp("misc/decorators.ts"),
9795
),
98-
"tools/package.json.gen.cpp": (
96+
"editor/package.json.gen.cpp": (
9997
"PACKAGE_JSON_CONTENT",
10098
dump_text_file_to_cpp("misc/package.json"),
10199
),
@@ -108,3 +106,6 @@ if TOOLS:
108106

109107
env_module.Append(CPPPATH=["#modules/javascript"])
110108
env_module.add_source_files(env.modules_sources, sources)
109+
110+
if env.editor_build:
111+
env_module.add_source_files(env.modules_sources, "editor/*.cpp")
File renamed without changes.
File renamed without changes.

register_types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "core/io/file_access_encrypted.h"
3838
#include "editor/editor_node.h"
3939
#include "editor/export/editor_export.h"
40-
#include "tools/editor_tools.h"
40+
#include "editor/editor_tools.h"
4141
void editor_init_callback();
4242

4343
class EditorExportJavaScript : public EditorExportPlugin {

0 commit comments

Comments
 (0)