Let gdextension_dir function as standalone argument#1258
Merged
dsnopek merged 1 commit intogodotengine:masterfrom Oct 19, 2023
Merged
Let gdextension_dir function as standalone argument#1258dsnopek merged 1 commit intogodotengine:masterfrom
gdextension_dir function as standalone argument#1258dsnopek merged 1 commit intogodotengine:masterfrom
Conversation
3a1fae9 to
30e6c43
Compare
Contributor
|
Thank you for looking into this, I agree this is a needed change. I would prefer doing the following though: diff --git a/tools/godotcpp.py b/tools/godotcpp.py
index 69a4652..6b44272 100644
--- a/tools/godotcpp.py
+++ b/tools/godotcpp.py
@@ -284,8 +284,8 @@ def generate(env):
def _godot_cpp(env):
- api_file = normalize_path(env.get("custom_api_file", env.File("gdextension/extension_api.json").abspath), env)
extension_dir = normalize_path(env.get("gdextension_dir", env.Dir("gdextension").abspath), env)
+ api_file = normalize_path(env.get("custom_api_file", env.File(extension_dir + "/extension_api.json").abspath), env)
bindings = env.GodotCPPBindings(
env.Dir("."),
[ |
This comment was marked as off-topic.
This comment was marked as off-topic.
Collaborator
|
I think this also needs to be rebased on the latest |
Contributor
Author
|
@Faless That'd certainly be simpler! I'll have double-check and see if that will work as expected, as I recall this variable being particularly finicky for some reason EDIT: Everything seems to work! |
30e6c43 to
5e53b7a
Compare
5e53b7a to
7a5cbca
Compare
Collaborator
|
Cherry-picked for 4.1 in PR #1281 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Right now, if you have a custom build of Godot to build against, you have to redundantly provide arguments for both a
gdextension_dirandcustom_api_file. This changes it so that, if onlygdextension_diris provided, it will implicitly setup a path forcustom_api_fileusing the default name