Skip to content

Fix compilation for master version of godot (soon to be beta 9) #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codecat merged 2 commits into from
Dec 19, 2022
Merged

Fix compilation for master version of godot (soon to be beta 9) #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85613f
Fix compilation for master version of godot
somebody1121 Dec 18, 2022
f598188
Sync with latest godot-cpp
somebody1121 Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion godot-cpp
Open in desktop
Submodule godot-cpp updated 44 files
+6 −0 .github/CODEOWNERS
+3 −3 .github/workflows/ci.yml
+35 −32 CMakeLists.txt
+3 −4 README.md
+15 −5 SConstruct
+50 −48 binding_generator.py
+20 −0 gdextension/README.md
+5,841 −6,211 gdextension/extension_api.json
+619 −0 gdextension/gdextension_interface.h
+0 −16 godot-headers/README.md
+0 −609 godot-headers/godot/gdnative_interface.h
+19 −8 include/godot_cpp/classes/ref.hpp
+95 −95 include/godot_cpp/classes/wrapped.hpp
+100 −100 include/godot_cpp/core/binder_common.hpp
+9 −9 include/godot_cpp/core/builtin_ptrcall.hpp
+33 −33 include/godot_cpp/core/class_db.hpp
+4 −4 include/godot_cpp/core/defs.hpp
+18 −18 include/godot_cpp/core/engine_ptrcall.hpp
+1 −1 include/godot_cpp/core/math.hpp
+1 −1 include/godot_cpp/core/memory.hpp
+56 −56 include/godot_cpp/core/method_bind.hpp
+31 −31 include/godot_cpp/core/method_ptrcall.hpp
+10 −10 include/godot_cpp/core/object.hpp
+2 −2 include/godot_cpp/core/property_info.hpp
+103 −103 include/godot_cpp/core/type_info.hpp
+17 −17 include/godot_cpp/godot.hpp
+11 −11 include/godot_cpp/variant/variant.hpp
+1 −1 misc/scripts/check_get_file_list.py
+3 −7 src/classes/wrapped.cpp
+51 −51 src/core/class_db.cpp
+8 −8 src/core/error_macros.cpp
+3 −3 src/core/memory.cpp
+5 −5 src/core/method_bind.cpp
+5 −5 src/core/object.cpp
+12 −12 src/godot.cpp
+20 −20 src/variant/char_string.cpp
+40 −40 src/variant/packed_arrays.cpp
+95 −95 src/variant/variant.cpp
+3 −3 test/CMakeLists.txt
+4 −1 test/demo/main.gd
+3 −1 test/demo/main.tscn
+32 −8 test/src/example.cpp
+13 −4 test/src/example.h
+2 −2 test/src/register_types.cpp
10 changes: 5 additions & 5 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <godot/gdnative_interface.h>
#include <gdextension_interface.h>

#include <godot_cpp/godot.hpp>
#include <godot_cpp/core/class_db.hpp>
Expand All @@ -21,10 +21,10 @@ void unregister_tbloader_types(ModuleInitializationLevel p_level)

extern "C"
{
GDNativeBool GDN_EXPORT tbloader_init(
const GDNativeInterface *p_interface,
const GDNativeExtensionClassLibraryPtr p_library,
GDNativeInitialization *r_initialization
GDExtensionBool GDE_EXPORT tbloader_init(
const GDExtensionInterface *p_interface,
const GDExtensionClassLibraryPtr p_library,
GDExtensionInitialization *r_initialization
) {
GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);

Expand Down
2 changes: 1 addition & 1 deletion src/tb_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <godot/gdnative_interface.h>
#include <gdextension_interface.h>

#include <godot_cpp/godot.hpp>
#include <godot_cpp/core/defs.hpp>
Expand Down