diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-11-03 15:57:52 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2015-11-13 10:01:26 +0000 |
| commit | d8da2c01d820137919f217367c758845e4817af2 (patch) | |
| tree | caaf040548189531ad4466c16df78b0a95ecccc9 /src/plugins/sceneparsers/sceneparsers.pro | |
| parent | 70581c93743ea60188192107d5f78ede274f247e (diff) | |
Build pre-built packages for Linux with libassimp support
Use the bundled libassimp if we are not cross-compiling
instead of explicitly specifying target platforms. It
allows to build the bundled libassimp for Linux (i386/x86_64).
Actually it should be possible to cross-compile libassimp,
but for now the cross-compilation fails for different reasons,
depending on the target platform.
Change-Id: I892d5eeb4ac5e767519f136a0ed636c0a9f86fa4
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/plugins/sceneparsers/sceneparsers.pro')
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index f7a922991..9271659db 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -config_assimp|win32:!wince*|osx: SUBDIRS += assimp +config_assimp|!cross_compile: SUBDIRS += assimp SUBDIRS += gltf - |