X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.h;h=9a25930aa8a8cf693980cf80720a23bb3508623b;hb=799d256e952913524c5e51a59c836e7a4cb52ea5;hp=21f3ec25ac0168e6f81c5d273d30e601fbb3272e;hpb=e943994f881a060b184aeee869a32a464f504a62;p=builder.git diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h index 21f3ec2..9a25930 100644 --- a/source/virtualfilesystem.h +++ b/source/virtualfilesystem.h @@ -3,12 +3,14 @@ #include #include +#include #include #include "buildinfo.h" class Builder; class FileTarget; class Pattern; +class Tool; /** Provides access to the filesystem in a way that takes known targets into @@ -18,14 +20,13 @@ possible to build them. class VirtualFileSystem { public: - typedef std::list SearchPath; + using SearchPath = std::list; private: - typedef std::map TargetMap; - Builder &builder; - TargetMap targets; + std::map targets; std::set nonexistent; + SearchPath sys_bin_path; public: VirtualFileSystem(Builder &); @@ -41,7 +42,7 @@ public: /** Locates a source file. If a file is found but no target is associated with it, a new package-less target is created with the appropriate tool. If use_syspath is true, the system path reported by the tool is also searched. */ - FileTarget *find_header(const std::string &, const SearchPath &, bool use_syspath = true); + FileTarget *find_header(const std::string &, Tool *, const SearchPath &, bool use_syspath = true); /** Locates a library. The library name should be the same as what would be used in linking with the library. If a file is found but no target is