Skip to content

Commit 9dff6f8

Browse files
committed
+
1 parent b74e76f commit 9dff6f8

2 files changed

Lines changed: 8 additions & 11 deletions

File tree

godot-bindings/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ default = []
3030

3131
api-custom = ["dep:regex", "dep:which"]
3232
api-custom-json = ["dep:nanoserde", "dep:which"]
33-
api-custom-extheader = []
3433

3534
# Safeguard levels (see godot/lib.rs for detailed documentation).
3635
safeguards-dev-balanced = []

godot-bindings/src/lib.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ mod depend_on_custom {
5959
Cow::Owned(godot_exe::load_gdextension_json(watch))
6060
}
6161

62-
pub fn load_gdextension_interface_json(_watch: &mut StopWatch) -> Cow<'static, str> {
63-
panic!(
64-
"gdextension_interface.json is not available in api-custom mode. Use prebuilt API instead."
65-
)
62+
pub fn load_gdextension_interface_json(watch: &mut StopWatch) -> Cow<'static, str> {
63+
watch.record("load_interface_json");
64+
gdextension_api::load_gdextension_interface_json()
6665
}
6766

6867
pub(crate) fn get_godot_version() -> GodotVersion {
@@ -92,10 +91,9 @@ mod depend_on_custom_json {
9291
Cow::Owned(result)
9392
}
9493

95-
pub fn load_gdextension_interface_json(_watch: &mut StopWatch) -> Cow<'static, str> {
96-
panic!(
97-
"gdextension_interface.json is not available in api-custom-json mode. Use prebuilt API instead."
98-
)
94+
pub fn load_gdextension_interface_json(watch: &mut StopWatch) -> Cow<'static, str> {
95+
watch.record("load_interface_json");
96+
gdextension_api::load_gdextension_interface_json()
9997
}
10098

10199
pub(crate) fn get_godot_version() -> GodotVersion {
@@ -116,13 +114,13 @@ mod depend_on_prebuilt {
116114
use crate::import::prebuilt;
117115

118116
pub fn load_gdextension_json(_watch: &mut StopWatch) -> std::borrow::Cow<'static, str> {
119-
prebuilt::load_gdextension_json()
117+
prebuilt::load_extension_api_json()
120118
}
121119

122120
pub fn load_gdextension_interface_json(
123121
_watch: &mut StopWatch,
124122
) -> std::borrow::Cow<'static, str> {
125-
prebuilt::load_gdextension_interface_json()
123+
gdextension_api::load_gdextension_interface_json()
126124
}
127125

128126
pub(crate) fn get_godot_version() -> GodotVersion {

0 commit comments

Comments
 (0)