Further changes for library compatibility

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 08da59af1c82a4de868cfdb20381a60857d06321..59dc1f9d190991a4bf5fbbfd9f7761515f932aff 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,12 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
@@ -53,13 +53,12 @@ void Binary::find_depends()
                        {
                                dep_libs.push_back(lib);
 
-                               if(Install *inst = dynamic_cast<Install *>(lib))
-                                       lib = &inst->get_source();
+                               lib = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
                                        queue.push_back(&stlib->get_component());
                        }
                        else
-                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
+                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
                }
        }
 
@@ -86,12 +85,12 @@ FS::Path Binary::generate_target_path(const Component &c)
 {
        const SourcePackage &pkg = c.get_package();
        string prefix, suffix;
-       const string &arch = pkg.get_builder().get_current_arch().get_name();
+       const string &sys = pkg.get_builder().get_current_arch().get_system();
 
        if(c.get_type()==Component::LIBRARY)
        {
                prefix = "lib";
-               if(arch=="win32")
+               if(sys=="windows")
                        suffix = ".dll";
                else
                        suffix = ".so";
@@ -100,7 +99,7 @@ FS::Path Binary::generate_target_path(const Component &c)
                suffix = ".m";
        else if(c.get_type()==Component::PROGRAM)
        {
-               if(arch=="win32")
+               if(sys=="windows")
                        suffix = ".exe";
        }