summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--1.4.0/dom/src/dae/daeElement.cpp1
-rw-r--r--ColladaDOM.pro2
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