diff --git a/Makefile b/Makefile index ee49a1a05..0b6bf4d75 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ ifeq ($(HAVE_RULES),yes) ifeq ($(PCRE_CONFIG),) $(error Did not find pcre-config) endif - override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags) + override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags) ifdef LIBS LIBS += $(shell $(PCRE_CONFIG) --libs) else diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake index 67454f0a4..6adac130d 100644 --- a/cmake/compilerDefinitions.cmake +++ b/cmake/compilerDefinitions.cmake @@ -22,7 +22,7 @@ if (CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug") endif() if (HAVE_RULES) - add_definitions(-DHAVE_RULES -DTIXML_USE_STL) + add_definitions(-DHAVE_RULES) endif() if (Boost_FOUND) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index 886738d58..f36597c44 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -630,7 +630,7 @@ int main(int argc, char **argv) << " ifeq ($(PCRE_CONFIG),)\n" << " $(error Did not find pcre-config)\n" << " endif\n" - << " override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags)\n" + << " override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)\n" << " ifdef LIBS\n" << " LIBS += $(shell $(PCRE_CONFIG) --libs)\n" << " else\n"