From 93b70cca9674535c30bdeefccc76029162c565d3 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 6 Aug 2018 10:16:23 +0200 Subject: 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 --- tools/tools.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') 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 +} -- cgit v1.2.3