summaryrefslogtreecommitdiff
path: root/thirdparty
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2022-05-23 12:05:55 +0200
committerRĂ©mi Verschelde <rverschelde@gmail.com>2022-05-23 18:52:27 +0200
commita648d831a9e4175db3b333e6416e2cf3be9959ef (patch)
treed4275c3511a7e5d9da6a16dba4a7ab2ed17cc1ce /thirdparty
parent3568b3deeaf3fbbf9e728ff25c7d0349075f9f1a (diff)
Fix building VHACD with GCC 13.
Fixes the following error: thirdparty/vhacd/inc/vhacdICHull.h:46:31: error: 'uint32_t' does not name a type 46 | ICHullError Process(const uint32_t nPointsCH, const double minVolume = 0.0); | ^~~~~~~~ Note the upstream version of the third party library is not affected.
Diffstat (limited to 'thirdparty')
-rw-r--r--thirdparty/vhacd/0006-fix-gcc13.patch15
-rw-r--r--thirdparty/vhacd/inc/vhacdICHull.h4
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 {