Merge pull request #1871 from dsnopek/4.4-cherrypicks-4

Cherry-picks for the godot-cpp 4.4 branch - 4th batch

Author: dsnopek

CMakeLists.txt

@@ -21,7 +21,8 @@ compromises need to be made to resolve those differences.
 As we are attempting to maintain feature parity, and ease of maintenance, these
 CMake scripts are built to resemble the SCons build system wherever possible.
 Where they are not, we will attempt to document common difference in
-doc/cmake.rst and platform specific differences in their respective
+the docs (https://docs.godotengine.org/en/latest/tutorials/scripting/cpp/build_system/cmake.html)
+and platform specific differences in their respective
 cmake/<platform>.cmake file.
 
 The file structure and file content are made to match, if not in content then

README.md

@@ -7,6 +7,7 @@
 > from Godot's `master` branch.
 >
 > For users of stable branches, switch to the branch matching your target Godot version:
+> - [`4.5`](https://github.com/godotengine/godot-cpp/tree/4.5)
 > - [`4.4`](https://github.com/godotengine/godot-cpp/tree/4.4)
 > - [`4.3`](https://github.com/godotengine/godot-cpp/tree/4.3)
 > - [`4.2`](https://github.com/godotengine/godot-cpp/tree/4.2)
@@ -62,15 +63,11 @@ See [Updating your GDExtension for 4.1](https://docs.godotengine.org/en/latest/t
 ## Contributing
 
 We greatly appreciate help in maintaining and extending this project. If you
-wish to help out, ensure you have an account on GitHub and create a "fork" of
-this repository. See [Pull request workflow](https://docs.godotengine.org/en/stable/community/contributing/pr_workflow.html)
-for instructions.
-
-Please install clang-format and the [pre-commit](https://pre-commit.com/) Python framework so formatting is done before your changes are submitted. See the [code style guidelines](https://docs.godotengine.org/en/latest/contributing/development/code_style_guidelines.html#pre-commit-hook) for instructions.
+wish to help out, please visit the [godot-cpp section of the Contributing docs](https://contributing.godotengine.org/en/latest/other/godot-cpp.html).
 
 ## Getting started
 
-You need the same C++ pre-requisites installed that are required for the `godot` repository. Follow the [official build instructions for your target platform](https://docs.godotengine.org/en/latest/contributing/development/compiling/index.html#building-for-target-platforms).
+You need the same C++ pre-requisites installed that are required for the `godot` repository. Follow the [official build instructions for your target platform](https://docs.godotengine.org/en/latest/engine_details/development/compiling/index.html).
 
 Getting started with GDExtensions is a bit similar to what it was for 3.x but also a bit different.
 

binding_generator.py

@@ -2746,12 +2746,12 @@ def correct_typed_dictionary(type_name):
 def correct_type(type_name, meta=None, use_alias=True):
     type_conversion = {"float": "double", "int": "int64_t", "Nil": "Variant"}
     if meta is not None:
-        if "int" in meta:
+        if meta in ["int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64"]:
             return f"{meta}_t"
-        elif "char" in meta:
-            return f"{meta}_t"
-        else:
+        elif meta in ["float", "double"]:
             return meta
+        elif meta in ["char16", "char32"]:
+            return f"{meta}_t"
     if type_name in type_conversion:
         return type_conversion[type_name]
     if type_name.startswith("typedarray::"):

cmake/android.cmake

@@ -22,16 +22,16 @@ Android platforms.
 
 .. _built-in support:https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-android
 
-There is further information and examples in the doc/cmake.rst file.
+There is further information and examples in the docs: https://docs.godotengine.org/en/latest/tutorials/scripting/cpp/build_system/cmake.html
 
 ]=======================================================================]
 
 #[============================[ Android Options ]============================]
 function(android_options)
     #[[ Options from SCons
 
-    The options below are managed by CMake toolchain files, doc.cmake.rst has
-    more information
+    The options below are managed by CMake toolchain files, the docs have more information:
+    https://docs.godotengine.org/en/latest/tutorials/scripting/cpp/build_system/cmake.html
 
     android_api_level : Target Android API level.
         Default = 21

cmake/linux.cmake

@@ -12,7 +12,8 @@ function(linux_options)
     #[[ Options from SCons
     use_llvm : Use the LLVM compiler
         Not implemented as compiler selection is managed by CMake. Look to
-        doc/cmake.rst for examples.
+        the docs (https://docs.godotengine.org/en/latest/tutorials/scripting/cpp/build_system/cmake.html)
+        for examples.
     ]]
     option(GODOTCPP_USE_STATIC_CPP "Link libgcc and libstdc++ statically for better portability" ON)
 endfunction()

cmake/windows.cmake

@@ -62,7 +62,9 @@ function(windows_options)
         Default: True
 
     These three options will not implemented as compiler selection is managed
-    by CMake toolchain files. Look to doc/cmake.rst for examples.
+    by CMake toolchain files. Look to the docs
+    (https://docs.godotengine.org/en/latest/tutorials/scripting/cpp/build_system/cmake.html)
+    for examples.
     use_mingw: Use the MinGW compiler instead of MSVC - only effective on Windows
     use_llvm: Use the LLVM compiler (MVSC or MinGW depending on the use_mingw flag
     mingw_prefix: MinGW prefix