Removed -DTIXML_USE_STL flag (danmar#5624)

Updated version of danmar#5145
chrchr-github · Nov 5, 2023 · 966a89d · 966a89d
1 parent 0dc53ac
commit 966a89d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"