From a648d831a9e4175db3b333e6416e2cf3be9959ef Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 23 May 2022 12:05:55 +0200 Subject: 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. --- thirdparty/vhacd/0006-fix-gcc13.patch | 15 +++++++++++++++ thirdparty/vhacd/inc/vhacdICHull.h | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 thirdparty/vhacd/0006-fix-gcc13.patch 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 ++// -- 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 +// -- GODOT end -- + namespace VHACD { //! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ). enum ICHullError { -- cgit v1.2.3