X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=488dd2966a27279e1d85ac8100f1be51977fdafd;hb=4c11e2a041d2064f44b7eb3dbf1976c35fc8881c;hp=ff1312205af0adf870a8ae040f271900eff5e02c;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index ff13122..488dd29 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
+#include <msp/path/utils.h>
+#include <msp/strings/formatter.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -13,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;
@@ -32,7 +34,9 @@ Finds and adds any required libraries to the dependencies.
 */
 void Executable::find_depends()
 {
-	LibMode libmode=package->get_library_mode();
+	LibMode libmode=comp.get_package().get_library_mode();
+	if(dynamic_cast<SharedLibrary *>(this))
+		libmode=DYNAMIC;
 
 	list<const Component *> queue;
 	list<Target *> dep_libs;
@@ -43,12 +47,11 @@ void Executable::find_depends()
 		queue.erase(queue.begin());
 
 		const StringList &libpath=c->get_build_info().libpath;
-		const string &arch=c->get_package().get_arch();
 
 		const list<string> &libs=c->get_build_info().libs;
 		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
 		{
-			Target *lib=builder.get_library(*i, arch, libpath, libmode);
+			Target *lib=builder.get_library(*i, libpath, libmode);
 			if(lib)
 			{
 				dep_libs.push_back(lib);
@@ -59,8 +62,7 @@ void Executable::find_depends()
 					queue.push_back(&stlib->get_component());
 			}
 			else
-				cout<<"Couldn't find library "<<*i<<" for "<<name<<'\n';
-				//XXX Throw an exception here or something
+				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, basename(name)));
 		}
 	}
 
@@ -89,8 +91,9 @@ we need to pass the value to the Target c'tor.
 */
 string Executable::generate_target_name(const Component &c)
 {
-	string prefix,suffix;
-	const string &arch=c.get_package().get_arch();
+	const SourcePackage &pkg=c.get_package();
+	string prefix, suffix;
+	const string &arch=pkg.get_builder().get_current_arch().get_name();
 
 	if(c.get_type()==Component::LIBRARY)
 	{
@@ -108,5 +111,5 @@ string Executable::generate_target_name(const Component &c)
 			suffix=".exe";
 	}
 
-	return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
+	return (pkg.get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }