X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=42ddcc43b25ba31c60f5a138694607c2f884f332;hb=4d0d003b022943d8a0e39ba19078bab8d32d8857;hp=7036efd7238eea0891a5516a616eacf7619c9fa8;hpb=0ac8d6708b8c758fb89d97a0049d4a329990b83b;p=builder.git diff --git a/source/builder.h b/source/builder.h index 7036efd..42ddcc4 100644 --- a/source/builder.h +++ b/source/builder.h @@ -41,7 +41,7 @@ public: const TargetMap &get_targets() const { return targets; } Target *get_header(const std::string &, const std::string &, const std::string &, const StringList &); Target *get_library(const std::string &, const std::string &, const StringList &, LibMode); - const Msp::Path::Path &get_cwd() const { return cwd; } + const Msp::Path &get_cwd() const { return cwd; } const Architecture &get_architecture(const std::string &) const; void apply_profile_template(Config &, const std::string &) const; void add_target(Target *); @@ -54,10 +54,10 @@ private: class Loader: public Msp::DataFile::Loader { public: - Loader(Builder &, const Msp::Path::Path &); + Loader(Builder &, const Msp::Path &); private: Builder &bld; - Msp::Path::Path src; + Msp::Path src; void architecture(const std::string &); void binpkg(const std::string &); @@ -81,7 +81,7 @@ private: StringList cmdline_targets; StringMap cmdline_options; - Msp::Path::Path cwd; + Msp::Path cwd; PackageMap packages; SourcePackage *main_pkg; @@ -110,10 +110,10 @@ private: bool build_all; bool create_makefile; - int load_build_file(const Msp::Path::Path &); + int load_build_file(const Msp::Path &); int create_targets(); - Target *get_header(const Msp::Path::Path &); - Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode); + Target *get_header(const Msp::Path &); + Target *get_library(const std::string &, const std::string &, const Msp::Path &, LibMode); void update_hash(std::string &, const std::string &); int do_build(); int do_clean();