Skip to content

Commit

Permalink
Update project for Godot version 4.2 (#64)
Browse files Browse the repository at this point in the history
* Update project for Godot version 4.2

* CI: Fix MinGW install error by pinning to earlier version

Same as for godot-cpp MinGW doesn't work with the newest version so the version is pinned to an earlier version: godotengine/godot-cpp#1259
  • Loading branch information
paddy-exe authored Dec 3, 2023
1 parent d834363 commit 46a6b99
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ jobs:
- name: Setup MinGW for Windows/MinGW build
if: ${{ matrix.platform == 'windows' }}
uses: egor-tensin/setup-mingw@v2
with:
version: 12.2.0

- name: Compile godot-cpp
shell: sh
Expand Down
10 changes: 9 additions & 1 deletion game/project.godot
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
; Engine configuration file.
; It's best edited using the editor UI and not directly,
; since the parameters that go here are not all obvious.
;
; Format:
; [section] ; section goes between []
; param=value ; assign values to parameters

config_version=5

[application]

config/name="GDExtensionSummator"
config/tags=PackedStringArray("gdextension", "template")
run/main_scene="res://main.tscn"
config/features=PackedStringArray("4.1")
config/features=PackedStringArray("4.2")
config/icon="res://icon.png"
2 changes: 1 addition & 1 deletion godot-cpp
Submodule godot-cpp updated 61 files
+24 −5 .github/workflows/ci.yml
+1 −1 .github/workflows/static_checks.yml
+5 −1 .gitignore
+21 −5 CMakeLists.txt
+26 −17 README.md
+16 −222 SConstruct
+214 −95 binding_generator.py
+11,940 −2,657 gdextension/extension_api.json
+336 −16 gdextension/gdextension_interface.h
+62 −0 include/godot_cpp/classes/editor_plugin_registration.hpp
+1 −1 include/godot_cpp/classes/ref.hpp
+204 −113 include/godot_cpp/classes/wrapped.hpp
+90 −0 include/godot_cpp/core/binder_common.hpp
+29 −19 include/godot_cpp/core/class_db.hpp
+13 −12 include/godot_cpp/core/memory.hpp
+2 −0 include/godot_cpp/core/method_ptrcall.hpp
+3 −22 include/godot_cpp/core/object.hpp
+62 −0 include/godot_cpp/core/object_id.hpp
+12 −0 include/godot_cpp/core/property_info.hpp
+9 −5 include/godot_cpp/godot.hpp
+21 −11 include/godot_cpp/templates/cowdata.hpp
+1 −1 include/godot_cpp/templates/list.hpp
+3 −3 include/godot_cpp/templates/rid_owner.hpp
+4 −4 include/godot_cpp/templates/thread_work_pool.hpp
+64 −0 include/godot_cpp/variant/callable_custom.hpp
+248 −0 include/godot_cpp/variant/callable_method_pointer.hpp
+79 −50 include/godot_cpp/variant/char_string.hpp
+29 −7 include/godot_cpp/variant/variant.hpp
+8 −0 include/godot_cpp/variant/vector3.hpp
+8 −0 include/godot_cpp/variant/vector3i.hpp
+8 −0 include/godot_cpp/variant/vector4.hpp
+8 −0 include/godot_cpp/variant/vector4i.hpp
+3 −3 src/classes/editor_plugin_registration.cpp
+73 −0 src/classes/wrapped.cpp
+28 −13 src/core/class_db.cpp
+8 −7 src/core/memory.cpp
+63 −20 src/godot.cpp
+113 −0 src/variant/callable_custom.cpp
+114 −0 src/variant/callable_method_pointer.cpp
+114 −100 src/variant/char_string.cpp
+24 −6 src/variant/variant.cpp
+16 −1 test/CMakeLists.txt
+11 −0 test/SConstruct
+7 −0 test/generate_xcframework.sh
+0 −0 test/project/bin/libgdexample.macos.template_debug.framework/Resources/Info.plist
+0 −0 test/project/bin/libgdexample.macos.template_release.framework/Resources/Info.plist
+19 −1 test/project/example.gdextension
+121 −0 test/project/main.gd
+2 −1 test/project/project.godot
+225 −0 test/src/example.cpp
+36 −0 test/src/example.h
+22 −8 tools/android.py
+344 −0 tools/godotcpp.py
+31 −6 tools/ios.py
+0 −26 tools/ios_osxcross.py
+5 −0 tools/linux.py
+28 −6 tools/macos.py
+0 −28 tools/macos_osxcross.py
+67 −15 tools/targets.py
+23 −24 tools/web.py
+31 −11 tools/windows.py

0 comments on commit 46a6b99

Please sign in to comment.