Add options for custom compiler and debug build to bootstrap.sh

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 56f9b32d3e09d5056717faf93d663b57d80648ec..ae44f2cd5751701dff67a5e18dc29183960adb6b 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -9,7 +9,8 @@ using namespace std;
 using namespace Msp;
 
 SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
-       Binary(b, p)
+       Binary(b, p),
+       import_lib(0)
 {
        libname = FS::basepart(FS::basename(path));
        if(!libname.compare(0, 3, "lib"))
@@ -18,9 +19,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
 
 SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
        Binary(b, c, generate_filename(c), objs),
-       libname(c.get_name())
+       libname(c.get_name()),
+       import_lib(0)
 {
-       install_location = "lib";
+       if(builder.get_current_arch().get_system()=="windows")
+               install_location = "bin";
+       else
+               install_location = "lib";
        if(component->get_type()==Component::MODULE)
                install_location /= package->get_name();
 
@@ -31,6 +36,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
                const Pattern &pattern = arch.get_shared_library_patterns().front();
                if(arch.get_system()=="windows")
                        soname = pattern.apply(format("%s-%s", component->get_name(), version));
+               else if(arch.get_system()=="darwin")
+               {
+                       string filename = pattern.apply(component->get_name());
+                       string base = FS::basepart(filename);
+                       string ext = FS::extpart(filename);
+                       soname = format("%s.%s%s", base, version, ext);
+               }
                else
                        soname = format("%s.%s", pattern.apply(component->get_name()), version);
 
@@ -48,3 +60,8 @@ string SharedLibrary::generate_filename(const Component &comp)
                return arch.get_shared_library_patterns().front().apply(comp.get_name());
        }
 }
+
+void SharedLibrary::set_import_library(ImportLibrary *imp)
+{
+       import_lib = imp;
+}