diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-23 19:19:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 19:19:14 +0200 |
| commit | 4f43739684314a791b34a115e7fc51de4fcec2c6 (patch) | |
| tree | 5b2d090c70abf620b92b4c9e39d3e74e52f31acb | |
| parent | 126470caa1290a56c7f835cfe4c2becf0d8f8003 (diff) | |
| parent | a648d831a9e4175db3b333e6416e2cf3be9959ef (diff) | |
Merge pull request #61310 from marxin/gcc13-fix-vhacd
| -rw-r--r-- | thirdparty/vhacd/0006-fix-gcc13.patch | 15 | ||||
| -rw-r--r-- | thirdparty/vhacd/inc/vhacdICHull.h | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/thirdparty/vhacd/0006-fix-gcc13.patch b/thirdparty/vhacd/0006-fix-gcc13.patch new file mode 100644 index 0000000000..954ac4556d --- /dev/null +++ b/thirdparty/vhacd/0006-fix-gcc13.patch @@ -0,0 +1,15 @@ +diff --git a/thirdparty/vhacd/inc/vhacdICHull.h b/thirdparty/vhacd/inc/vhacdICHull.h +index 132bdcfb3e..925584cf52 100644 +--- a/thirdparty/vhacd/inc/vhacdICHull.h ++++ b/thirdparty/vhacd/inc/vhacdICHull.h +@@ -18,6 +18,10 @@ + #include "vhacdManifoldMesh.h" + #include "vhacdVector.h" + ++// -- GODOT start -- ++#include <cstdint> ++// -- GODOT end -- ++ + namespace VHACD { + //! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ). + enum ICHullError { diff --git a/thirdparty/vhacd/inc/vhacdICHull.h b/thirdparty/vhacd/inc/vhacdICHull.h index 132bdcfb3e..925584cf52 100644 --- a/thirdparty/vhacd/inc/vhacdICHull.h +++ b/thirdparty/vhacd/inc/vhacdICHull.h @@ -18,6 +18,10 @@ #include "vhacdManifoldMesh.h" #include "vhacdVector.h" +// -- GODOT start -- +#include <cstdint> +// -- GODOT end -- + namespace VHACD { //! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ). enum ICHullError { |