Skip to content

Commit 134e8b7

Browse files
authored
Merge pull request #1819 from dsnopek/fix-custom-api-file-scons-401
Fix `custom_api_file` with SCons 4.0.1
2 parents 8bb931c + 8e7dfbc commit 134e8b7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tools/godotcpp.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,17 +258,15 @@ def options(opts, env):
258258
help="Path to a custom directory containing GDExtension interface header and API JSON file",
259259
default=env.get("gdextension_dir", None),
260260
validator=validate_dir,
261-
),
262-
converter=normalize_path,
261+
)
263262
)
264263
opts.Add(
265264
PathVariable(
266265
key="custom_api_file",
267266
help="Path to a custom GDExtension API JSON file (takes precedence over `gdextension_dir`)",
268267
default=env.get("custom_api_file", None),
269268
validator=validate_file,
270-
),
271-
converter=normalize_path,
269+
)
272270
)
273271
opts.Add(
274272
BoolVariable(
@@ -537,8 +535,10 @@ def generate(env):
537535

538536

539537
def _godot_cpp(env):
540-
extension_dir = env.get("gdextension_dir", default=env.Dir("gdextension").srcnode().abspath)
541-
api_file = env.get("custom_api_file", default=os.path.join(extension_dir, "extension_api.json"))
538+
extension_dir = normalize_path(env.get("gdextension_dir", default=env.Dir("gdextension").srcnode().abspath), env)
539+
api_file = normalize_path(
540+
env.get("custom_api_file", default=os.path.join(extension_dir, "extension_api.json")), env
541+
)
542542

543543
bindings = env.GodotCPPBindings(
544544
env.Dir("."),

0 commit comments

Comments
 (0)