Fix build
This commit is contained in:
parent
0a10b8b1e7
commit
072094f3e7
@ -1,3 +1,16 @@
|
|||||||
|
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 {
|
||||||
|
|
||||||
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
|
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
|
||||||
index e7da7f4..c41dd53 100644
|
index e7da7f4..c41dd53 100644
|
||||||
--- a/src/3rdparty/assimp/src/code/Common/Importer.h
|
--- a/src/3rdparty/assimp/src/code/Common/Importer.h
|
||||||
|
@ -59,7 +59,6 @@ Requires: qt6-qtbase-devel%{?_isa}
|
|||||||
%if 0%{?examples}
|
%if 0%{?examples}
|
||||||
%package examples
|
%package examples
|
||||||
Summary: Programming examples for %{name}
|
Summary: Programming examples for %{name}
|
||||||
# BuildRequires: qt6-qt3d-devel >= %{version}
|
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
%description examples
|
%description examples
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -76,8 +75,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
# Disable LTO
|
# Disable LTO
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF}
|
%cmake_qt6 \
|
||||||
# -DQT_FEATURE_qt3d_system_assimp=ON
|
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
|
||||||
|
-DQT_FEATURE_qt3d_system_assimp=OFF
|
||||||
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user