parent
828ec2c5d0
commit
10676e78e3
5 changed files with 43 additions and 1 deletions
1
thirdparty/glslang/glslang/Include/Common.h
vendored
1
thirdparty/glslang/glslang/Include/Common.h
vendored
|
@ -45,6 +45,7 @@
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#endif
|
#endif
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
#include <cstdint>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
12
thirdparty/openxr/patches/fix-gcc13-stdint.patch
vendored
Normal file
12
thirdparty/openxr/patches/fix-gcc13-stdint.patch
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/thirdparty/openxr/src/common/platform_utils.hpp b/thirdparty/openxr/src/common/platform_utils.hpp
|
||||||
|
index 85d5cdab10..2d870cfea7 100644
|
||||||
|
--- a/thirdparty/openxr/src/common/platform_utils.hpp
|
||||||
|
+++ b/thirdparty/openxr/src/common/platform_utils.hpp
|
||||||
|
@@ -11,6 +11,7 @@
|
||||||
|
|
||||||
|
#include "xr_dependencies.h"
|
||||||
|
#include <string>
|
||||||
|
+#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
// OpenXR paths and registry key locations
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
#include "xr_dependencies.h"
|
#include "xr_dependencies.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
// OpenXR paths and registry key locations
|
// OpenXR paths and registry key locations
|
||||||
|
|
23
thirdparty/vhacd/0006-fix-gcc13.patch
vendored
23
thirdparty/vhacd/0006-fix-gcc13.patch
vendored
|
@ -13,3 +13,26 @@ index 132bdcfb3e..925584cf52 100644
|
||||||
namespace VHACD {
|
namespace VHACD {
|
||||||
//! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
|
//! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).
|
||||||
enum ICHullError {
|
enum ICHullError {
|
||||||
|
diff --git a/thirdparty/vhacd/inc/vhacdManifoldMesh.h b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
|
||||||
|
index a48f53c5c5..5eed4e13aa 100644
|
||||||
|
--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
|
||||||
|
+++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
|
||||||
|
@@ -18,6 +18,11 @@ All rights reserved.
|
||||||
|
#include "vhacdCircularList.h"
|
||||||
|
#include "vhacdSArray.h"
|
||||||
|
#include "vhacdVector.h"
|
||||||
|
+
|
||||||
|
+// -- GODOT start --
|
||||||
|
+#include <cstdint>
|
||||||
|
+// -- GODOT end --
|
||||||
|
+
|
||||||
|
namespace VHACD {
|
||||||
|
class TMMTriangle;
|
||||||
|
class TMMEdge;
|
||||||
|
@@ -139,4 +144,4 @@ private:
|
||||||
|
friend class ICHull;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
-#endif // VHACD_MANIFOLD_MESH_H
|
||||||
|
\ No newline at end of file
|
||||||
|
+#endif // VHACD_MANIFOLD_MESH_H
|
||||||
|
|
7
thirdparty/vhacd/inc/vhacdManifoldMesh.h
vendored
7
thirdparty/vhacd/inc/vhacdManifoldMesh.h
vendored
|
@ -18,6 +18,11 @@ All rights reserved.
|
||||||
#include "vhacdCircularList.h"
|
#include "vhacdCircularList.h"
|
||||||
#include "vhacdSArray.h"
|
#include "vhacdSArray.h"
|
||||||
#include "vhacdVector.h"
|
#include "vhacdVector.h"
|
||||||
|
|
||||||
|
// -- GODOT start --
|
||||||
|
#include <cstdint>
|
||||||
|
// -- GODOT end --
|
||||||
|
|
||||||
namespace VHACD {
|
namespace VHACD {
|
||||||
class TMMTriangle;
|
class TMMTriangle;
|
||||||
class TMMEdge;
|
class TMMEdge;
|
||||||
|
@ -139,4 +144,4 @@ private:
|
||||||
friend class ICHull;
|
friend class ICHull;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
#endif // VHACD_MANIFOLD_MESH_H
|
#endif // VHACD_MANIFOLD_MESH_H
|
||||||
|
|
Loading…
Reference in a new issue