X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=634ccd81ff433cc31d6d7febe4a11cc3da36b98f;hb=f5d3127099bc41f986094eb98732849ee9bfb748;hp=efa20efea3a6af31b9003a99396ac66be018f992;hpb=4c11e2a041d2064f44b7eb3dbf1976c35fc8881c;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index efa20ef..634ccd8 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "buildinfo.h"
 #include "compile.h"
@@ -24,9 +25,9 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	work_dir=comp.get_package().get_source();
 
 	const TargetList &deps=obj.get_depends();
-	Path spath=deps.front()->get_name();
+	FS::Path spath=deps.front()->get_name();
 
-	string ext=splitext(spath.str()).ext;
+	string ext=FS::extpart(spath.str());
 	const char *tool=0;
 	if(ext==".cpp" || ext==".cc")
 		tool="CXX";
@@ -37,6 +38,8 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	argv.push_back("-c");
 
 	const BuildInfo &binfo=comp.get_build_info();
+	for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
+		argv.push_back("-W"+*i);
 	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
 		argv.push_back(*i);
 	for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
@@ -44,13 +47,13 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 	for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
 		argv.push_back("-D"+*i);
 
-	Path opath=obj.get_name();
+	FS::Path opath=obj.get_name();
 	argv.push_back("-o");
 	argv.push_back(relative(opath, work_dir).str());
 	argv.push_back(relative(spath, work_dir).str());
 
 	if(!builder.get_dry_run())
-		mkpath(opath.subpath(0, opath.size()-1), 0755);
+		FS::mkpath(FS::dirname(opath), 0755);
 
 	announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());