updated godot-cpp submodule to @vanos's cmake rewrite PR + one line c…

…make buildfix in the project scripts
vorlac · Mar 16, 2024 · edd486b · edd486b
1 parent 174b4f7
commit edd486b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/cmake/godot-dev-configuration.cmake b/cmake/godot-dev-configuration.cmake
@@ -83,22 +83,22 @@ if(NOT EXISTS "${godot_debug_editor_executable}")
     if (WIN32)
         set(SCONS_COMMAND powershell -c)
     endif()
-    
-    set(SCONS_COMMAND 
+
+    set(SCONS_COMMAND
       ${SCONS_COMMAND}
-      ${SCONS_PROGRAM} 
-          target=editor 
-          use_static_cpp=yes 
-          dev_build=yes 
-          debug_symbols=yes 
-          optimize=none 
+      ${SCONS_PROGRAM}
+          target=editor
+          use_static_cpp=yes
+          dev_build=yes
+          debug_symbols=yes
+          optimize=none
           use_lto=no
     )
 
     set(GODOT_ENGINE_CLEAN_BUILD OFF)
     if (GODOT_ENGINE_CLEAN_BUILD MATCHES ON)
         message(STATUS "Invoking scons clean: ${SCONS_COMMAND} --clean")
-        
+
         execute_process(
             COMMAND "${SCONS_PROGRAM}" --clean
             WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/extern/godot-engine"
@@ -127,6 +127,7 @@ endif()
 # Godot C++ bindings library setup/configuration
 # =======================================================================
 
+set(USE_STATIC_CPP OFF)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extern/godot-cpp)
 
 # =======================================================================

diff --git a/extern/godot-cpp b/extern/godot-cpp
+1 −1		.github/workflows/ci.yml
+77 −170		CMakeLists.txt
+4 −1		README.md
+3 −2		binding_generator.py
+16 −15		cmake/GodotCompilerWarnings.cmake
+65 −0		cmake/android.cmake
+299 −0		cmake/godotcpp.cmake
+62 −0		cmake/ios.cmake
+59 −0		cmake/linux.cmake
+51 −0		cmake/macos.cmake
+26 −0		cmake/web.cmake
+51 −0		cmake/windows.cmake
+22 −22		include/godot_cpp/core/binder_common.hpp
+7 −0		include/godot_cpp/variant/variant.hpp
+3 −0		include/godot_cpp/variant/vector2i.hpp
+11 −0		include/godot_cpp/variant/vector3i.hpp
+11 −0		include/godot_cpp/variant/vector4i.hpp
+5 −0		src/godot.cpp
+8 −0		src/variant/vector2i.cpp
+58 −150		test/CMakeLists.txt
+39 −0		test/project/export_presets.cfg
+3 −0		test/run-tests.sh
+6 −0		tools/android.py
+3 −0		tools/godotcpp.py