X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=c25c6f213f3e7c791525aad240259384335c60ac;hb=18672bb72051a50cd9f7c45c274ae705e0605611;hp=6600b740332a23dff7a882a0a63e6c99afcbd8ec;hpb=ec0d6014aa2db4a02588c9027e7dba17507df364;p=builder.git diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp index 6600b74..c25c6f2 100644 --- a/source/sharedlibrary.cpp +++ b/source/sharedlibrary.cpp @@ -1,7 +1,7 @@ #include #include +#include "binarycomponent.h" #include "builder.h" -#include "component.h" #include "objectfile.h" #include "sharedlibrary.h" #include "sourcepackage.h" @@ -28,7 +28,8 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const listget_type()==Component::MODULE) + const BinaryComponent &bcomp = dynamic_cast(*component); + if(bcomp.get_type()==BinaryComponent::MODULE) install_location /= package->get_name(); else { @@ -59,8 +60,9 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list(comp); + if(bcomp.get_type()==BinaryComponent::MODULE) + return comp.get_name()+".dlm"; else { const Architecture &arch = comp.get_package().get_builder().get_current_arch();