X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=25353cf23282576e4280a189d213aafa1354e7cc;hb=52586d9f4aa721e924d17c7e9a16cb0b98ddc05d;hp=ea2f4e0204684cb94ea25799fcd57e50a8029040;hpb=0f5283a54fd188072eca23fbd980a43c6c869913;p=builder.git diff --git a/source/executable.cpp b/source/executable.cpp index ea2f4e0..25353cf 100644 --- a/source/executable.cpp +++ b/source/executable.cpp @@ -5,7 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ -#include +#include #include #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(this)) + libmode=DYNAMIC; list queue; list 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); } /**