From ce862e02aaf6de070bf2b85f7153b0a62bb20dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 9 Sep 2012 13:08:04 +0200
Subject: [PATCH] dmake: New version of TinyXml needs -DTIXML_USE_STL define in
 linux

---
 Makefile        | 2 +-
 tools/dmake.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 412f36e10..719fb30e5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ ifndef CXXFLAGS
 endif
 
 ifeq ($(HAVE_RULES),yes)
-    CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags)
+    CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)
     ifdef LIBS
         LIBS += $(shell pcre-config --libs)
     else
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 2d1b24a5a..32ddbe28b 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -290,7 +290,7 @@ int main(int argc, char **argv)
     }
 
     fout << "ifeq ($(HAVE_RULES),yes)\n"
-         << "    CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags)\n"
+         << "    CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)\n"
          << "    ifdef LIBS\n"
          << "        LIBS += $(shell pcre-config --libs)\n"
          << "    else\n"