Skip to content

Commit a648d83

Browse files
marxinakien-mga
authored andcommitted
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.
1 parent 3568b3d commit a648d83

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

Diff for: thirdparty/vhacd/0006-fix-gcc13.patch

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/thirdparty/vhacd/inc/vhacdICHull.h b/thirdparty/vhacd/inc/vhacdICHull.h
2+
index 132bdcfb3e..925584cf52 100644
3+
--- a/thirdparty/vhacd/inc/vhacdICHull.h
4+
+++ b/thirdparty/vhacd/inc/vhacdICHull.h
5+
@@ -18,6 +18,10 @@
6+
#include "vhacdManifoldMesh.h"
7+
#include "vhacdVector.h"
8+
9+
+// -- GODOT start --
10+
+#include <cstdint>
11+
+// -- GODOT end --
12+
+
13+
namespace VHACD {
14+
//! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
15+
enum ICHullError {

Diff for: thirdparty/vhacd/inc/vhacdICHull.h

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
#include "vhacdManifoldMesh.h"
1919
#include "vhacdVector.h"
2020

21+
// -- GODOT start --
22+
#include <cstdint>
23+
// -- GODOT end --
24+
2125
namespace VHACD {
2226
//! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
2327
enum ICHullError {

0 commit comments

Comments
 (0)