diff --git a/cmake/godot-dev-configuration.cmake b/cmake/godot-dev-configuration.cmake
index ec3b665..4f3c617 100644
--- 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
index 54136ee..4861eb1 160000
--- a/extern/godot-cpp
+++ b/extern/godot-cpp
@@ -1 +1 @@
-Subproject commit 54136ee8357c5140a3775c54f08db5f7deda2058
+Subproject commit 4861eb1c3e17aa87f1a91be565e76d94574a5c9b