qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow to build assimp sceneparser on Android when using clang 

Which should be all Android builds since gcc has been deprecated
in favor of clang in the NDK.

Also disable building of tools when cross compiling

Change-Id: Idb3f88130bf211926f7dd4ce52ac6582d806570d
Task-number: QTBUG-65542
Reviewed-by: Mike Krus <mike.krus@kdab.com>
This commit is contained in:
Paul Lemire 2018-08-06 10:16:23 +02:00 committed by Mike Krus
parent 752ee8daab
commit 93b70cca96
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/sceneparsers/sceneparsers.pro
View File

@ -2,8 +2,9 @@ TEMPLATE = subdirs
# QNX is not supported, and Linux GCC 4.9 on ARM chokes on the assimp
# sources (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964).
QT_FOR_CONFIG += 3dcore-private
qtConfig(assimp):if(qtConfig(system-assimp)|!cross_compile): \
qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|!cross_compile): {
SUBDIRS += assimp
}
SUBDIRS += gltf
qtConfig(temporaryfile):qtConfig(regularexpression) {

3
tools/tools.pro
View File

@ -1,4 +1,5 @@
TEMPLATE = subdirs
QT_FOR_CONFIG += 3dcore-private
qtConfig(assimp):qtConfig(commandlineparser): \
qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: {
SUBDIRS += qgltf
}