From 720bd3d2a9d6ccc5cdd22d61ca6f94f508133a54 Mon Sep 17 00:00:00 2001 From: somebody_master Date: Sun, 11 Jun 2023 12:42:47 +0200 Subject: [PATCH] Add support for godot 4.1 Signed-off-by: somebody_master --- Test.gd | 2 +- gdextension/godot-cpp | 2 +- gdextension/src/register_types.cpp | 4 ++-- project.godot | 2 +- test.gdextension | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Test.gd b/Test.gd index e6dd2df..b9e019b 100644 --- a/Test.gd +++ b/Test.gd @@ -6,4 +6,4 @@ func _ready() -> void: # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(_delta: float) -> void: - pass; + pass diff --git a/gdextension/godot-cpp b/gdextension/godot-cpp index 3a9118c..d12cf07 160000 --- a/gdextension/godot-cpp +++ b/gdextension/godot-cpp @@ -1 +1 @@ -Subproject commit 3a9118cb0dafef74773216c47a030c3a4a490747 +Subproject commit d12cf071bbdcfda6875e78167d282278ab420878 diff --git a/gdextension/src/register_types.cpp b/gdextension/src/register_types.cpp index e8c974d..162563a 100644 --- a/gdextension/src/register_types.cpp +++ b/gdextension/src/register_types.cpp @@ -31,8 +31,8 @@ void uninitialize_test_module(ModuleInitializationLevel p_level) { extern "C" { // Initialization. -GDExtensionBool GDE_EXPORT test_library_init(const GDExtensionInterface *p_interface, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { - godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization); +GDExtensionBool GDE_EXPORT test_library_init(const GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { + GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); init_obj.register_initializer(initialize_test_module); init_obj.register_terminator(uninitialize_test_module); init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE); diff --git a/project.godot b/project.godot index 1e93961..f63e6a2 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="TestGDExtension" run/main_scene="res://TestGDExtension.tscn" -config/features=PackedStringArray("4.0", "Forward Plus") +config/features=PackedStringArray("4.1", "Forward Plus") config/icon="res://icon.svg" [dotnet] diff --git a/test.gdextension b/test.gdextension index 3f882cf..3667682 100644 --- a/test.gdextension +++ b/test.gdextension @@ -1,6 +1,7 @@ [configuration] entry_symbol = "test_library_init" +compatibility_minimum = 4.1 [libraries]