Migrate from msppath to mspfs

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index ea2f4e0204684cb94ea25799fcd57e50a8029040..25353cf23282576e4280a189d213aafa1354e7cc 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -5,7 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/utils.h>
 #include <msp/strings/formatter.h>
 #include "builder.h"
 #include "component.h"
@@ -14,6 +14,7 @@ Distributed under the LGPL
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sharedlibrary.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -34,6 +35,8 @@ Finds and adds any required libraries to the dependencies.
 void Executable::find_depends()
 {
        LibMode libmode=comp.get_package().get_library_mode();
+       if(dynamic_cast<SharedLibrary *>(this))
+               libmode=DYNAMIC;
 
        list<const Component *> queue;
        list<Target *> dep_libs;
@@ -59,7 +62,7 @@ void Executable::find_depends()
                                        queue.push_back(&stlib->get_component());
                        }
                        else
-                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, basename(name)));
+                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
                }
        }
 
@@ -77,9 +80,9 @@ void Executable::find_depends()
        deps_ready=true;
 }
 
-Action *Executable::build()
+Action *Executable::create_action()
 {
-       return Target::build(new Link(builder, *this));;
+       return new Link(builder, *this);
 }
 
 /**