walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

dmake: New version of TinyXml needs -DTIXML_USE_STL define in linux

This commit is contained in:
Daniel Marjamäki 2012-09-09 13:08:04 +02:00
parent ea941adae2
commit ce862e02aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -41,7 +41,7 @@ ifndef CXXFLAGS
endif endif
ifeq ($(HAVE_RULES),yes) ifeq ($(HAVE_RULES),yes)
CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags) CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)
ifdef LIBS ifdef LIBS
LIBS += $(shell pcre-config --libs) LIBS += $(shell pcre-config --libs)
else else

2
tools/dmake.cpp
View File

@ -290,7 +290,7 @@ int main(int argc, char **argv)
} }
fout << "ifeq ($(HAVE_RULES),yes)\n" 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" << " ifdef LIBS\n"
<< " LIBS += $(shell pcre-config --libs)\n" << " LIBS += $(shell pcre-config --libs)\n"
<< " else\n" << " else\n"