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

"#ifndef" can't be used in Makefile (it is considered a commented line). Replaced it with "ifndef".

This commit is contained in:
Reijo Tomperi 2011-04-11 22:54:29 +03:00
parent 2b2f9f7a27
commit 485ff0b472
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -103,12 +103,12 @@ TESTOBJ = test/options.o \
test/testunusedprivfunc.o \ test/testunusedprivfunc.o \
test/testunusedvar.o test/testunusedvar.o
#ifndef TINYXML ifndef TINYXML
TINYXML = externals/tinyxml/tinystr.o \ TINYXML = externals/tinyxml/tinystr.o \
externals/tinyxml/tinyxml.o \ externals/tinyxml/tinyxml.o \
externals/tinyxml/tinyxmlerror.o \ externals/tinyxml/tinyxmlerror.o \
externals/tinyxml/tinyxmlparser.o externals/tinyxml/tinyxmlparser.o
#endif endif
EXTOBJ += $(TINYXML) EXTOBJ += $(TINYXML)

4
tools/dmake.cpp
View File

@ -124,7 +124,7 @@ static void makeExtObj(std::ostream &fout, const std::vector<std::string> &exter
if (start) if (start)
{ {
libName = getLibName(externalfiles[i]); libName = getLibName(externalfiles[i]);
fout << "#ifndef " << libName << std::endl; fout << "ifndef " << libName << std::endl;
fout << " " << libName << " = " << objfile(externalfiles[i]); fout << " " << libName << " = " << objfile(externalfiles[i]);
libNames << "EXTOBJ += $(" << libName << ")" << std::endl; libNames << "EXTOBJ += $(" << libName << ")" << std::endl;
start = false; start = false;
@ -137,7 +137,7 @@ static void makeExtObj(std::ostream &fout, const std::vector<std::string> &exter
if (i+1 >= externalfiles.size() || libName != getLibName(externalfiles[i+1])) if (i+1 >= externalfiles.size() || libName != getLibName(externalfiles[i+1]))
{ {
// This was the last file for this library // This was the last file for this library
fout << std::endl << "#endif" << std::endl; fout << std::endl << "endif" << std::endl;
fout << "\n\n"; fout << "\n\n";
start = true; start = true;
} }