diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-05-16 17:13:57 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-08-02 11:09:06 +0000 |
| commit | ef4ee5a2d31910e0109ba0d6eda1d2a6bfc3124c (patch) | |
| tree | 25aa21d1ddce5c5264637b3f0a65cfdd16bd6497 /src/plugins/sceneparsers/sceneparsers.pro | |
| parent | cbeade7bde94a795eed14cdeadcb79184fa87858 (diff) | |
Re-add libassimp 3.1.1 to 3rd party
Previously the assimp library was a dependency that was
always built, but it is possible to use an external
system version if one is available. It is however non-
trivial to provide the dependency on platforms other
than Linux, so now we provide a copy of libassimp for
use when it is not already available.
This commit is a combination of reverting commit
672b3e47299f6ba0034f73b252d0436b55fb3085 which removed
assimp and introduced the scene parser, and adding the
logic to use the system version when available.
Change-Id: Ia05f9a92b8d82f19a0db3588b2bbeafe71404386
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/sceneparsers.pro')
| -rw-r--r-- | src/plugins/sceneparsers/sceneparsers.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro index 90a15ede2..53899e493 100644 --- a/src/plugins/sceneparsers/sceneparsers.pro +++ b/src/plugins/sceneparsers/sceneparsers.pro @@ -1,5 +1,2 @@ TEMPLATE = subdirs - -config_assimp { - SUBDIRS += assimp -} +config_assimp|win32:!wince*|osx: SUBDIRS += assimp |