X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=a967bbd7535aa7b83256856092fb867c2ab1fd6f;hb=242c55b17e6608b29a77ca17a5b677e202a3ca90;hp=9b208c1709bcd88acc882d8744ef9b53f6c63d1b;hpb=77461a8c0e2b5686b04cf15f3a9333b215813992;p=builder.git diff --git a/source/buildinfo.h b/source/buildinfo.h index 9b208c1..a967bbd 100644 --- a/source/buildinfo.h +++ b/source/buildinfo.h @@ -1,7 +1,7 @@ /* $Id$ This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -22,18 +22,19 @@ class BuildInfo public: class Loader: public Msp::DataFile::Loader { - public: - Loader(BuildInfo &); private: BuildInfo &binfo; - void cflag(const std::string &s) { binfo.cflags.push_back(s); } - void incpath(const std::string &s) { binfo.incpath.push_back(s); } - void define(const std::string &s) { binfo.defines.push_back(s); } - void ldflag(const std::string &s) { binfo.ldflags.push_back(s); } - void libpath(const std::string &s) { binfo.libpath.push_back(s); } - void library(const std::string &s) { binfo.libs.push_back(s); } - void warning(const std::string &s) { binfo.warnings.push_back(s); } + public: + Loader(BuildInfo &); + private: + void cflag(const std::string &); + void incpath(const std::string &); + void define(const std::string &); + void ldflag(const std::string &); + void libpath(const std::string &); + void library(const std::string &); + void warning(const std::string &); }; StringList cflags; @@ -44,10 +45,12 @@ public: StringList libs; StringList warnings; + /** Adds another BuildInfo to the end of this one. */ void add(const BuildInfo &); + + /** Makes sure there are no duplicate entries in the lists. For warnings, + contradicting flags are eliminated and the last one stays in effect. */ void unique(); -private: - void unique(StringList &); }; #endif