From 485ff0b4728cf2e407ce25d62df07205463fe08d Mon Sep 17 00:00:00 2001 From: Reijo Tomperi Date: Mon, 11 Apr 2011 22:54:29 +0300 Subject: [PATCH] "#ifndef" can't be used in Makefile (it is considered a commented line). Replaced it with "ifndef". --- Makefile | 4 ++-- tools/dmake.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index db79d67b8..1947268e0 100644 --- a/Makefile +++ b/Makefile @@ -103,12 +103,12 @@ TESTOBJ = test/options.o \ test/testunusedprivfunc.o \ test/testunusedvar.o -#ifndef TINYXML +ifndef TINYXML TINYXML = externals/tinyxml/tinystr.o \ externals/tinyxml/tinyxml.o \ externals/tinyxml/tinyxmlerror.o \ externals/tinyxml/tinyxmlparser.o -#endif +endif EXTOBJ += $(TINYXML) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index a3819c216..6a26d133f 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -124,7 +124,7 @@ static void makeExtObj(std::ostream &fout, const std::vector &exter if (start) { libName = getLibName(externalfiles[i]); - fout << "#ifndef " << libName << std::endl; + fout << "ifndef " << libName << std::endl; fout << " " << libName << " = " << objfile(externalfiles[i]); libNames << "EXTOBJ += $(" << libName << ")" << std::endl; start = false; @@ -137,7 +137,7 @@ static void makeExtObj(std::ostream &fout, const std::vector &exter if (i+1 >= externalfiles.size() || libName != getLibName(externalfiles[i+1])) { // This was the last file for this library - fout << std::endl << "#endif" << std::endl; + fout << std::endl << "endif" << std::endl; fout << "\n\n"; start = true; }