Skip to content

Commit

Permalink
Fix building VHACD with GCC 13.
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit a648d83)
  • Loading branch information
marxin authored and akien-mga committed Nov 5, 2024
1 parent 03c984a commit 777c3c2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
15 changes: 15 additions & 0 deletions thirdparty/vhacd/0006-fix-gcc13.patch
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 4 additions & 0 deletions thirdparty/vhacd/inc/vhacdICHull.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 777c3c2

Please sign in to comment.