qt6-qt3d/qt3d-assimp-fix-build.patch

42 lines
1.5 KiB
Diff
Raw Permalink Normal View History

2023-01-18 07:32:34 +00:00
diff --git a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
index 3488120..79b838d 100644
--- a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+++ b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
@@ -56,6 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/DefaultLogger.hpp>
#include <assimp/StringUtils.h>
+#include <cstdint>
+
namespace Assimp {
namespace FBX {
2021-06-08 07:15:30 +00:00
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
2021-09-14 06:21:09 +00:00
index e7da7f4..c41dd53 100644
2021-06-08 07:15:30 +00:00
--- a/src/3rdparty/assimp/src/code/Common/Importer.h
+++ b/src/3rdparty/assimp/src/code/Common/Importer.h
2021-09-14 06:21:09 +00:00
@@ -50,6 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2021-06-08 07:15:30 +00:00
#include <string>
#include <assimp/matrix4x4.h>
+#include <exception>
+#include <stdexcept>
+
struct aiScene;
namespace Assimp {
diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
2021-09-14 06:21:09 +00:00
index 09b5b68..327c71f 100644
2021-06-08 07:15:30 +00:00
--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
+++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
2021-09-14 06:21:09 +00:00
@@ -61,6 +61,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <exception>
2021-06-08 07:15:30 +00:00
+#include <exception>
+#include <stdexcept>
+
namespace Assimp {
// =======================================================================
// Public interface to Assimp