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

Fixed broken HAVE_RULE support. Updated Makefile. Added override keyword when HAVE_RULES is set.

This commit is contained in:
orbitcowboy 2015-11-13 11:38:06 +01:00
parent f9bc229d4b
commit ab90a7eb49
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

@ -90,7 +90,7 @@ else ifeq ($(CXX), clang++)
endif endif
ifeq ($(HAVE_RULES),yes) ifeq ($(HAVE_RULES),yes)
CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags) override 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

@ -363,7 +363,7 @@ int main(int argc, char **argv)
<< "\n"; << "\n";
fout << "ifeq ($(HAVE_RULES),yes)\n" fout << "ifeq ($(HAVE_RULES),yes)\n"
<< " CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)\n" << " override 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"