Skip to content

Commit 966a89d

Browse files
authored
Removed -DTIXML_USE_STL flag (#5624)
Updated version of #5145
1 parent 0dc53ac commit 966a89d

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ ifeq ($(HAVE_RULES),yes)
155155
ifeq ($(PCRE_CONFIG),)
156156
$(error Did not find pcre-config)
157157
endif
158-
override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags)
158+
override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)
159159
ifdef LIBS
160160
LIBS += $(shell $(PCRE_CONFIG) --libs)
161161
else

cmake/compilerDefinitions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
2222
endif()
2323

2424
if (HAVE_RULES)
25-
add_definitions(-DHAVE_RULES -DTIXML_USE_STL)
25+
add_definitions(-DHAVE_RULES)
2626
endif()
2727

2828
if (Boost_FOUND)

tools/dmake.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ int main(int argc, char **argv)
630630
<< " ifeq ($(PCRE_CONFIG),)\n"
631631
<< " $(error Did not find pcre-config)\n"
632632
<< " endif\n"
633-
<< " override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags)\n"
633+
<< " override CXXFLAGS += -DHAVE_RULES $(shell $(PCRE_CONFIG) --cflags)\n"
634634
<< " ifdef LIBS\n"
635635
<< " LIBS += $(shell $(PCRE_CONFIG) --libs)\n"
636636
<< " else\n"

0 commit comments

Comments
 (0)