From b71c945ac421d3067b5a95213b6d6de7f63c73a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 9 Feb 2018 17:44:26 +0100 Subject: [PATCH] fix build (CFG_DIR => CFGDIR) and run dmake. --- Makefile | 2 +- lib/platform.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bded37efc..7c4d6189e 100644 --- a/Makefile +++ b/Makefile @@ -413,7 +413,7 @@ $(SRCDIR)/path.o: lib/path.cpp lib/cxx11emu.h lib/path.h lib/config.h lib/utils. $(SRCDIR)/pathmatch.o: lib/pathmatch.cpp lib/cxx11emu.h lib/pathmatch.h lib/config.h lib/path.h lib/utils.h $(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(SRCDIR)/pathmatch.o $(SRCDIR)/pathmatch.cpp -$(SRCDIR)/platform.o: lib/platform.cpp lib/cxx11emu.h lib/platform.h lib/config.h +$(SRCDIR)/platform.o: lib/platform.cpp lib/cxx11emu.h lib/platform.h lib/config.h lib/path.h $(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(SRCDIR)/platform.o $(SRCDIR)/platform.cpp $(SRCDIR)/preprocessor.o: lib/preprocessor.cpp lib/cxx11emu.h lib/preprocessor.h lib/config.h lib/errorlogger.h lib/suppressions.h lib/library.h lib/mathlib.h lib/standards.h lib/path.h lib/settings.h lib/importproject.h lib/platform.h lib/utils.h lib/timer.h diff --git a/lib/platform.cpp b/lib/platform.cpp index 551671a32..a84005b2c 100644 --- a/lib/platform.cpp +++ b/lib/platform.cpp @@ -170,8 +170,8 @@ bool cppcheck::Platform::platformFile(const char exename[], const std::string &f std::string cfgdir = CFGDIR; if (cfgdir[cfgdir.size()-1] != '/') cfgdir += '/'; - filenames.push_back(CFG_DIR + ("../platforms/" + filename)); - filenames.push_back(CFG_DIR + ("../platforms/" + filename + ".xml")); + filenames.push_back(CFGDIR + ("../platforms/" + filename)); + filenames.push_back(CFGDIR + ("../platforms/" + filename + ".xml")); #endif bool success = false; for (int i = 0; i < filenames.size(); ++i) {