mirror of
				https://github.com/godotengine/godot.git
				synced 2025-10-31 13:41:03 +00:00 
			
		
		
		
	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.
(cherry picked from commit a648d831a9)
			
			
This commit is contained in:
		
							parent
							
								
									6cc1dc309f
								
							
						
					
					
						commit
						dbcd83c7c2
					
				
					 2 changed files with 19 additions and 0 deletions
				
			
		
							
								
								
									
										15
									
								
								thirdparty/vhacd/0006-fix-gcc13.patch
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								thirdparty/vhacd/0006-fix-gcc13.patch
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -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
									
								
								thirdparty/vhacd/inc/vhacdICHull.h
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								thirdparty/vhacd/inc/vhacdICHull.h
									
										
									
									
										vendored
									
									
								
							|  | @ -18,6 +18,10 @@ | ||||||
| #include "vhacdManifoldMesh.h" | #include "vhacdManifoldMesh.h" | ||||||
| #include "vhacdVector.h" | #include "vhacdVector.h" | ||||||
| 
 | 
 | ||||||
|  | // -- GODOT start --
 | ||||||
|  | #include <cstdint> | ||||||
|  | // -- GODOT end --
 | ||||||
|  | 
 | ||||||
| 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 { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Martin Liska
						Martin Liska