diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2018-08-06 10:16:23 +0200 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2018-08-13 19:31:24 +0000 |
| commit | 93b70cca9674535c30bdeefccc76029162c565d3 (patch) | |
| tree | 1ba54e249f27d8c05eecc297536946b80996d650 | |
| parent | 752ee8daabdeeb43ae97c0eb6dce397305704c6a (diff) | |
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>
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 3 | ||||
| -rw-r--r-- | tools/tools.pro | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index cb274b472..e4b421606 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -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) { diff --git a/tools/tools.pro b/tools/tools.pro index 64f2b9fc7..c2f692034 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): \ +qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: { SUBDIRS += qgltf +} |