diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-07 11:36:55 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-07 11:36:55 +0200 |
| commit | 10676e78e33c9f5dd2e2957ecddcfd6699173ea7 (patch) | |
| tree | 1127672e7c14c8a98eaac8c57ce65dabd0c524ad | |
| parent | 828ec2c5d005b6499c7c4c88beaf81767d05614b (diff) | |
| download | redot-engine-10676e78e33c9f5dd2e2957ecddcfd6699173ea7.tar.gz | |
Add missing stdint.h includes for GCC 13+
Fixes #77927.
| -rw-r--r-- | thirdparty/glslang/glslang/Include/Common.h | 1 | ||||
| -rw-r--r-- | thirdparty/openxr/patches/fix-gcc13-stdint.patch | 12 | ||||
| -rw-r--r-- | thirdparty/openxr/src/common/platform_utils.hpp | 1 | ||||
| -rw-r--r-- | thirdparty/vhacd/0006-fix-gcc13.patch | 23 | ||||
| -rw-r--r-- | thirdparty/vhacd/inc/vhacdManifoldMesh.h | 7 |
5 files changed, 43 insertions, 1 deletions
diff --git a/thirdparty/glslang/glslang/Include/Common.h b/thirdparty/glslang/glslang/Include/Common.h index a5b41cb397..0a8a986eda 100644 --- a/thirdparty/glslang/glslang/Include/Common.h +++ b/thirdparty/glslang/glslang/Include/Common.h @@ -45,6 +45,7 @@ #include <cmath> #endif #include <cstdio> +#include <cstdint> #include <cstdlib> #include <list> #include <map> diff --git a/thirdparty/openxr/patches/fix-gcc13-stdint.patch b/thirdparty/openxr/patches/fix-gcc13-stdint.patch new file mode 100644 index 0000000000..9e659eb210 --- /dev/null +++ b/thirdparty/openxr/patches/fix-gcc13-stdint.patch @@ -0,0 +1,12 @@ +diff --git a/thirdparty/openxr/src/common/platform_utils.hpp b/thirdparty/openxr/src/common/platform_utils.hpp +index 85d5cdab10..2d870cfea7 100644 +--- a/thirdparty/openxr/src/common/platform_utils.hpp ++++ b/thirdparty/openxr/src/common/platform_utils.hpp +@@ -11,6 +11,7 @@ + + #include "xr_dependencies.h" + #include <string> ++#include <stdint.h> + #include <stdlib.h> + + // OpenXR paths and registry key locations diff --git a/thirdparty/openxr/src/common/platform_utils.hpp b/thirdparty/openxr/src/common/platform_utils.hpp index 85d5cdab10..2d870cfea7 100644 --- a/thirdparty/openxr/src/common/platform_utils.hpp +++ b/thirdparty/openxr/src/common/platform_utils.hpp @@ -11,6 +11,7 @@ #include "xr_dependencies.h" #include <string> +#include <stdint.h> #include <stdlib.h> // OpenXR paths and registry key locations diff --git a/thirdparty/vhacd/0006-fix-gcc13.patch b/thirdparty/vhacd/0006-fix-gcc13.patch index 954ac4556d..b8df42b936 100644 --- a/thirdparty/vhacd/0006-fix-gcc13.patch +++ b/thirdparty/vhacd/0006-fix-gcc13.patch @@ -13,3 +13,26 @@ index 132bdcfb3e..925584cf52 100644 namespace VHACD { //! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ). enum ICHullError { +diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h +index a48f53c5c5..5eed4e13aa 100644 +--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h ++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h +@@ -18,6 +18,11 @@ All rights reserved. + #include "vhacdCircularList.h" + #include "vhacdSArray.h" + #include "vhacdVector.h" ++ ++// -- GODOT start -- ++#include <cstdint> ++// -- GODOT end -- ++ + namespace VHACD { + class TMMTriangle; + class TMMEdge; +@@ -139,4 +144,4 @@ private: + friend class ICHull; + }; + } +-#endif // VHACD_MANIFOLD_MESH_H +\ No newline at end of file ++#endif // VHACD_MANIFOLD_MESH_H diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h index a48f53c5c5..5eed4e13aa 100644 --- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h +++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h @@ -18,6 +18,11 @@ All rights reserved. #include "vhacdCircularList.h" #include "vhacdSArray.h" #include "vhacdVector.h" + +// -- GODOT start -- +#include <cstdint> +// -- GODOT end -- + namespace VHACD { class TMMTriangle; class TMMEdge; @@ -139,4 +144,4 @@ private: friend class ICHull; }; } -#endif // VHACD_MANIFOLD_MESH_H
\ No newline at end of file +#endif // VHACD_MANIFOLD_MESH_H |