Adjust to library changes

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 653a81ad22cf51ca83bbced40c0183c991b89947..a4fc14b5d8b8343c99ca7fbacb0db7faafe7a73b 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -22,13 +22,15 @@ Distributed under the LGPL
 
 class Analyzer;
 class Config;
+class FileTarget;
 class Package;
 class SourcePackage;
+class VirtualTarget;
 
 /**
 The main application class.  Controls and owns everything.  Rules the world.
 */
-class Builder: public Msp::Application
+class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
        class Loader: public Msp::DataFile::Loader
@@ -69,6 +71,7 @@ private:
        SourcePackage *main_pkg;
        PathList pkg_path;
        PathList pkg_dirs;
+       bool no_externals;
 
        TargetMap targets;
        TargetList new_tgts;
@@ -98,7 +101,6 @@ private:
        Msp::FS::Path prefix;
        StringList warnings;
 
-       static Msp::Application::RegApp<Builder> reg;
        static std::string usagemsg;
        static std::string helpmsg;
 
@@ -146,7 +148,8 @@ public:
 
        /** Adds a target to both the target map and the new target queue.  Called
        from Target constructor. */
-       void add_target(Target *);
+       void add_target(FileTarget *);
+       void add_target(VirtualTarget *);
 
        void problem(const std::string &, const std::string &);