X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnutools.cpp;h=fdd6e797414c86e6c47e38c791be1bd0bac77ac1;hb=3043044d8ef02ef77def454fdede87927f5aa1f8;hp=20463e6b42e493c1dbb37575f46af1f71c4db5c6;hpb=88e3ad4afa2010507227c0c0ffb9d1ce08f61e2a;p=builder.git

diff --git a/source/gnutools.cpp b/source/gnutools.cpp
index 20463e6..fdd6e79 100644
--- a/source/gnutools.cpp
+++ b/source/gnutools.cpp
@@ -1,17 +1,19 @@
-#include "architecture.h"
+#include "builder.h"
 #include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
+#include "gnucompiler.h"
 #include "gnulinker.h"
 #include "gnutools.h"
 #include "mingwdlltool.h"
 
 GnuTools::GnuTools(Builder &builder, const Architecture &arch)
 {
-	add_tool(new GnuCCompiler(builder, arch));
-	add_tool(new GnuCxxCompiler(builder, arch));
+	add_tool(new GnuCompiler(builder, arch, "CC"));
+	add_tool(new GnuCompiler(builder, arch, "CXX"));
+	add_tool(new GnuCompiler(builder, arch, "OBJC"));
+
 	add_tool(new GnuLinker(builder, arch));
 	add_tool(new GnuArchiver(builder, arch));
+
 	if(arch.get_system()=="windows")
 		add_tool(new MingwDllTool(builder, arch));
 }