diff options
| author | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-10-26 11:20:37 +0300 |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-10-26 10:39:08 +0000 |
| commit | 24c3515c0e7cde091a9b0df7b19e24e8e49af61b (patch) | |
| tree | c84522c31cbc3d12d8d9caf141fee9d6e4d7b0d9 | |
| parent | c5405a178d2dcc04413064d0979deadb9c101038 (diff) | |
Build Collada without boost
Remove Boost dependency
Task-number: QT3DS-17
Change-Id: Ic6f6bc76aa50ac9949f754758ae84407a0e7aa43
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | 1.4.0/dom/src/dae/daeElement.cpp | 1 | ||||
| -rw-r--r-- | ColladaDOM.pro | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/1.4.0/dom/src/dae/daeElement.cpp b/1.4.0/dom/src/dae/daeElement.cpp index ca70d4d..1b148a5 100644 --- a/1.4.0/dom/src/dae/daeElement.cpp +++ b/1.4.0/dom/src/dae/daeElement.cpp @@ -19,6 +19,7 @@ #include <dae/daeDom.h> #include <limits> +#include <algorithm> #include <iomanip> using namespace std; diff --git a/ColladaDOM.pro b/ColladaDOM.pro index edf555a..587e5d0 100644 --- a/ColladaDOM.pro +++ b/ColladaDOM.pro @@ -1,7 +1,7 @@ TARGET = ColladaDOM include($$PWD/../../commonplatform.pri) CONFIG += staticlib -DEFINES += HAVE_CONFIG_H DOM_INCLUDE_TINYXML PCRE_STATIC BOOST_ALL_NO_LIB \ +DEFINES += HAVE_CONFIG_H DOM_INCLUDE_TINYXML PCRE_STATIC NO_BOOST \ NO_ZAE COLLADA_DOM_SUPPORT141 DOM_DYNAMIC DOM_EXPORT win32 { QMAKE_LFLAGS += /NODEFAULTLIB:tinyxml.lib |