From ae2f2d3826be472710c3980729aeb93cedccb423 Mon Sep 17 00:00:00 2001 From: Jonas Hoffmann Date: Wed, 12 Jul 2023 22:12:15 +0200 Subject: [PATCH] Add Godot 4.1 Support - Update godot-cpp - Fix Entry Point that changed within Godot 4.1 - Add compatibility_minimum to gdextension required for 4.1 support - Bump version in plugin.cfg - Upgrade demo project to 4.1 --- demo/addons/godot-git-plugin/git_plugin.gdextension | 1 + demo/addons/godot-git-plugin/plugin.cfg | 2 +- demo/project.godot | 2 +- godot-cpp | 2 +- godot-git-plugin/src/gdlibrary.cpp | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/demo/addons/godot-git-plugin/git_plugin.gdextension b/demo/addons/godot-git-plugin/git_plugin.gdextension index 3e51918..49fffbf 100644 --- a/demo/addons/godot-git-plugin/git_plugin.gdextension +++ b/demo/addons/godot-git-plugin/git_plugin.gdextension @@ -1,6 +1,7 @@ [configuration] entry_symbol = "git_plugin_init" +compatibility_minimum = "4.1.0" [libraries] diff --git a/demo/addons/godot-git-plugin/plugin.cfg b/demo/addons/godot-git-plugin/plugin.cfg index be25f2d..7fa6a04 100644 --- a/demo/addons/godot-git-plugin/plugin.cfg +++ b/demo/addons/godot-git-plugin/plugin.cfg @@ -3,5 +3,5 @@ name="Godot Git Plugin" description="This plugin lets you interact with Git without leaving the Godot editor. More information can be found at https://github.com/godotengine/godot-git-plugin/wiki" author="twaritwaikar" -version="v3.0.0-beta1" +version="v3.0.1" script="godot-git-plugin.gd" diff --git a/demo/project.godot b/demo/project.godot index 150b3a0..8bdc985 100644 --- a/demo/project.godot +++ b/demo/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/features=PackedStringArray("4.0") +config/features=PackedStringArray("4.1") [editor] diff --git a/godot-cpp b/godot-cpp index 9d1c396..d627942 160000 --- a/godot-cpp +++ b/godot-cpp @@ -1 +1 @@ -Subproject commit 9d1c396c54fc3bdfcc7da4f3abcb52b14f6cce8f +Subproject commit d627942b647105aff600225a59dffa65de206247 diff --git a/godot-git-plugin/src/gdlibrary.cpp b/godot-git-plugin/src/gdlibrary.cpp index e6f10c6..241245c 100644 --- a/godot-git-plugin/src/gdlibrary.cpp +++ b/godot-git-plugin/src/gdlibrary.cpp @@ -19,8 +19,8 @@ void uninitialize_git_plugin_module(godot::ModuleInitializationLevel p_level) { extern "C" { -GDExtensionBool GDE_EXPORT git_plugin_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { - godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization); +GDExtensionBool GDE_EXPORT git_plugin_init(const GDExtensionInterfaceGetProcAddress p_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { + godot::GDExtensionBinding::InitObject init_obj(p_address, p_library, r_initialization); init_obj.register_initializer(initialize_git_plugin_module); init_obj.register_terminator(uninitialize_git_plugin_module);