Add target and tools for compiling Objective-C sources

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index b73618f25ae637b36d5b1c96ffca2f55ccd4b0d2..e501f69e0513631d8611830ae2c2b1f7cd75a963 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -11,19 +11,14 @@
 #include <msp/time/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
-#include "copy.h"
+#include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
-#include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
-#include "gnulinker.h"
+#include "gnutools.h"
 #include "installedfile.h"
-#include "mingwdlltool.h"
 #include "package.h"
-#include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "tar.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -81,15 +76,10 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuLinker(*this, *current_arch));
-       toolchain.add_tool(new GnuArchiver(*this, *current_arch));
-       toolchain.add_tool(new Copy(*this));
-       toolchain.add_tool(new Tar(*this));
-       toolchain.add_tool(new PkgConfigGenerator(*this));
-       if(current_arch->get_system()=="windows")
-               toolchain.add_tool(new MingwDllTool(*this, *current_arch));
+       if(current_arch->get_system()=="darwin")
+               toolchain.add_toolchain(new ClangTools(*this, *current_arch));
+       toolchain.add_toolchain(new GnuTools(*this, *current_arch));
+       toolchain.add_toolchain(new BuiltinTools(*this));
        toolchain.add_tool(new DataTool(*this));
 }