Migrate from msppath to mspfs

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 6790082861875c087fee7f34d953e3e4445f8bf5..778f74642acc72ca476f2a70224db1e886f7bd2e 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "compile.h"
 #include "component.h"
@@ -95,5 +96,5 @@ Action *ObjectFile::create_action()
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
        const SourcePackage &pkg=comp.get_package();
-       return (pkg.get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
+       return (pkg.get_temp_dir()/comp.get_name()/(FS::basepart(FS::basename(src))+".o")).str();
 }