Update godot-cpp (4.3 cherry-picks); Add build profiles (#141)

(cherry picked from f0563ce)
alessandrofama · Jan 29, 2025 · 6071c16 · 6071c16
1 parent 3a86810
commit 6071c16
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 17 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -13,6 +13,8 @@ env:
   GODOT_ENGINE_VERSION: "4.3.0"
   GODOT_ENGINE_STAGE: "stable"
   INTEGRATION_VERSION: "3.0.0"
+  BUILD_PROFILE_EDITOR: "build_profile_editor.json"
+  BUILD_PROFILE_RUNTIME: "build_profile_runtime.json"
 
 jobs:
   build-all:
@@ -208,7 +210,7 @@ jobs:
         run: |
           cd addons/Wwise/native
           mkdir -p godot-cpp/bin
-          scons platform=${{ matrix.scons-platform }} target=editor wwise_config=profile use_static_cpp=yes wwise_sdk=wwise_sdk
+          scons platform=${{ matrix.scons-platform }} target=editor wwise_config=profile use_static_cpp=yes wwise_sdk=wwise_sdk build_profile=${{ env.BUILD_PROFILE_EDITOR }}
           cd ../../../
 
       - name: Compile template_debug library
@@ -219,7 +221,7 @@ jobs:
           SCONS_CACHE_LIMIT: 7168
         run: |
           cd addons/Wwise/native
-          scons platform=${{ matrix.scons-platform }} target=template_debug wwise_config=profile use_static_cpp=yes wwise_sdk=wwise_sdk ${{ matrix.debug-flags }}
+          scons platform=${{ matrix.scons-platform }} target=template_debug wwise_config=profile use_static_cpp=yes wwise_sdk=wwise_sdk build_profile=${{ env.BUILD_PROFILE_RUNTIME }} ${{ matrix.debug-flags }}
           cd ../../../
 
       - name: Compile template_release library
@@ -230,7 +232,7 @@ jobs:
           SCONS_CACHE_LIMIT: 7168
         run: |
           cd addons/Wwise/native
-          scons platform=${{ matrix.scons-platform }} target=template_release wwise_config=release use_static_cpp=yes wwise_sdk=wwise_sdk ${{ matrix.release-flags }}
+          scons platform=${{ matrix.scons-platform }} target=template_release wwise_config=release use_static_cpp=yes wwise_sdk=wwise_sdk build_profile=${{ env.BUILD_PROFILE_RUNTIME }} ${{ matrix.release-flags }}
           cd ../../../
 
       - name: Compile Android libraries
@@ -241,10 +243,10 @@ jobs:
           WWISESDK=$(pwd)
           cd ../godot-cpp
           mkdir -p bin
-          scons platform=android target=template_debug dev_build=yes -j6 ${{ matrix.debug-flags-arm64 }}
-          scons platform=android target=template_debug dev_build=yes -j6 ${{ matrix.debug-flags-arm32 }}
-          scons platform=android target=template_release -j6 ${{ matrix.release-flags-arm64 }}
-          scons platform=android target=template_release -j6 ${{ matrix.release-flags-arm32 }}
+          scons platform=android target=template_debug dev_build=yes build_profile="../build_profile_runtime.json" -j6 ${{ matrix.debug-flags-arm64 }}
+          scons platform=android target=template_debug dev_build=yes build_profile="../build_profile_runtime.json" -j6 ${{ matrix.debug-flags-arm32 }}
+          scons platform=android target=template_release build_profile="../build_profile_runtime.json" -j6 ${{ matrix.release-flags-arm64 }}
+          scons platform=android target=template_release build_profile="../build_profile_runtime.json" -j6 ${{ matrix.release-flags-arm32 }}
           cd ../android
           chmod +x ./gradlew
           ./gradlew assemble -PWWISE_SDK="$WWISESDK"

diff --git a/addons/Wwise/native/build_profile_editor.json b/addons/Wwise/native/build_profile_editor.json
@@ -0,0 +1,49 @@
+{
+	"enabled_classes":[
+		"AcceptDialog",
+		"Area3D",
+		"ArrayMesh",
+		"BoxShape3D",
+		"Button",
+		"CollisionShape3D",
+		"ConfigFile",
+		"DirAccess",
+		"DisplayServer",
+		"EditorExportPlatform",
+		"EditorExportPlugin",
+		"EditorFileSystem",
+		"EditorInspectorPlugin",
+		"EditorInterface",
+		"EditorNode3DGizmo",
+		"EditorNode3DGizmoPlugin",
+		"EditorPlugin",
+		"EditorProperty",
+		"EditorSettings",
+		"Engine",
+		"FileAccess",
+		"HBoxContainer",
+		"JSON",
+		"LineEdit",
+		"MeshDataTool",
+		"MeshInstance3D",
+		"Node2D",
+		"Node3D",
+		"OS",
+		"PackedScene",
+		"ProjectSettings",
+		"ResourceLoader",
+		"ResourceSaver",
+		"SceneTree",
+		"Script",
+		"Shortcut",
+		"StandardMaterial3D",
+		"Texture2D",
+		"Thread",
+		"Time",
+		"Timer",
+		"Tree",
+		"TreeItem",
+		"VBoxContainer",
+		"WorkerThreadPool"
+	]
+}
diff --git a/addons/Wwise/native/build_profile_runtime.json b/addons/Wwise/native/build_profile_runtime.json
@@ -0,0 +1,22 @@
+{
+	"enabled_classes": [
+		"Area3D",
+		"ArrayMesh",
+		"BoxShape3D",
+		"CollisionShape3D",
+		"DisplayServer",
+		"Engine",
+		"Material",
+		"MeshDataTool",
+		"MeshInstance3D",
+		"Node2D",
+		"Node3D",
+		"OS",
+		"ProjectSettings",
+		"ResourceLoader",
+		"SceneTree",
+		"Texture2D",
+		"Thread",
+		"Window"
+	]
+}
diff --git a/addons/Wwise/native/godot-cpp b/addons/Wwise/native/godot-cpp
diff --git a/addons/Wwise/native/src/core/types/wwise_base_type.h b/addons/Wwise/native/src/core/types/wwise_base_type.h
@@ -2,14 +2,14 @@
 
 #if defined(TOOLS_ENABLED)
 #include "editor/ak_editor_settings.h"
+#include <godot_cpp/classes/resource_saver.hpp>
 #endif
 
 #include "core/utils.h"
 #include "core/wwise_object_type.h"
 #include "editor/short_id_generator.h"
 #include <godot_cpp/classes/resource.hpp>
 #include <godot_cpp/classes/resource_loader.hpp>
-#include <godot_cpp/classes/resource_saver.hpp>
 
 using namespace godot;
 

diff --git a/addons/Wwise/native/src/core/types/wwise_event.h b/addons/Wwise/native/src/core/types/wwise_event.h
@@ -2,12 +2,12 @@
 
 #ifdef TOOLS_ENABLED
 #include "editor/wwise_project_database.h"
+#include <godot_cpp/classes/editor_file_system.hpp>
+#include <godot_cpp/classes/editor_interface.hpp>
 #endif
 
 #include "core/types/wwise_base_type.h"
 #include "core/wwise_gdextension.h"
-#include <godot_cpp/classes/editor_file_system.hpp>
-#include <godot_cpp/classes/editor_interface.hpp>
 #include <godot_cpp/classes/node3d.hpp>
 
 using namespace godot;

diff --git a/addons/Wwise/native/src/core/utils.h b/addons/Wwise/native/src/core/utils.h
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "AK/SoundEngine/Common/AkTypes.h"
+#if defined(TOOLS_ENABLED)
 #include <godot_cpp/classes/dir_access.hpp>
+#endif
+
+#include "AK/SoundEngine/Common/AkTypes.h"
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/node.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
@@ -329,6 +332,13 @@ static inline bool find_matching_vertex(Vector3 vertex, Dictionary vert_dict, in
 	}
 }
 
+
+static inline AkGameObjectID get_ak_game_object_id(const Node* p_node)
+{
+	return p_node == nullptr ? AK_INVALID_GAME_OBJECT : p_node->get_instance_id();
+}
+
+#if defined(TOOLS_ENABLED)
 static bool make_dir_recursive(const String& p_directory)
 {
 	if (!DirAccess::dir_exists_absolute(p_directory))
@@ -364,8 +374,4 @@ static PackedStringArray take(const PackedStringArray& folders, int n)
 	}
 	return result;
 }
-
-static inline AkGameObjectID get_ak_game_object_id(const Node* p_node)
-{
-	return p_node == nullptr ? AK_INVALID_GAME_OBJECT : p_node->get_instance_id();
-}
+#endif
+14 −11		.github/actions/godot-cache-restore/action.yml
+6 −5		.github/actions/godot-cache-save/action.yml
+62 −0		.github/actions/setup-godot-cpp/action.yml
+14 −37		.github/workflows/ci.yml
+21 −0		.github/workflows/runner.yml
+7 −2		.github/workflows/static_checks.yml
+4 −0		.gitignore
+15 −219		CMakeLists.txt
+1 −2		README.md
+19 −144		binding_generator.py
+183 −0		build_profile.py
+1 −1		cmake/common_compiler_flags.cmake
+240 −0		cmake/godotcpp.cmake
+57 −0		doc/cmake.md
+6 −2		include/godot_cpp/classes/ref.hpp
+21 −11		include/godot_cpp/classes/wrapped.hpp
+5 −2		include/godot_cpp/core/class_db.hpp
+8 −0		include/godot_cpp/core/defs.hpp
+73 −0		include/godot_cpp/core/print_string.hpp
+1 −1		include/godot_cpp/variant/basis.hpp
+42 −44		include/godot_cpp/variant/quaternion.hpp
+0 −2		include/godot_cpp/variant/variant.hpp
+4 −3		include/godot_cpp/variant/vector4.hpp
+31 −17		misc/scripts/check_get_file_list.py
+22 −20		src/classes/wrapped.cpp
+6 −1		src/core/class_db.cpp
+39 −0		src/core/print_string.cpp
+5 −2		src/variant/basis.cpp
+28 −40		src/variant/quaternion.cpp
+1 −0		test/SConstruct
+5 −1		test/build_profile.json
+5 −0		tools/android.py
+31 −1		tools/common_compiler_flags.py
+42 −1		tools/godotcpp.py
+5 −0		tools/ios.py
+4 −0		tools/linux.py
+5 −0		tools/macos.py
+8 −0		tools/web.py
+56 −9		tools/windows.py