X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=26a0ab4b7246d5c24eccd6f26c494fa0fea54335;hb=refs%2Ftags%2F0.9;hp=f4e8fc2ee734f11e3306b38a03a60e7309d8a027;hpb=4d0d003b022943d8a0e39ba19078bab8d32d8857;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index f4e8fc2..26a0ab4 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -5,8 +5,10 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/core/error.h>
-#include <msp/path/utils.h>
+#include <msp/core/except.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/strings/lexicalcast.h>
 #include "builder.h"
 #include "component.h"
@@ -41,6 +43,22 @@ void Component::create_build_info()
 	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
 		build_info.add((*i)->get_exported_binfo());
 
+	for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+		*i=(pkg.get_source() / *i).str();
+	for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
+		*i=(pkg.get_source() / *i).str();
+
+	if(pkg.get_library_mode()!=DYNAMIC)
+	{
+		// XXX This may pull in some unnecessary libpaths too.  More thought required.
+		PackageList reqs=pkg.collect_requires();
+		for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i)
+		{
+			const BuildInfo &ebi=(*i)->get_exported_binfo();
+			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
+		}
+	}
+
 	if(type==PROGRAM)
 	{
 		string strip=pkg.get_config().get_option("strip").value;
@@ -80,8 +98,7 @@ void Component::create_targets() const
 	list<Target *> inst_tgts;
 	for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
 	{
-		string basename=(*i)[-1];
-		string ext=splitext(basename).ext;
+		string ext=FS::extpart(FS::basename(*i));
 		if((ext==".cpp" || ext==".c") && build_exe)
 		{
 			SourceFile *src=new SourceFile(builder, this, i->str());
@@ -146,8 +163,7 @@ PathList Component::collect_source_files() const
 	PathList files;
 	for(PathList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
 	{
-		struct stat st=stat(*i);
-		if(S_ISDIR(st.st_mode))
+		if(FS::is_dir(*i))
 		{
 			list<string> sfiles=list_files(*i);
 			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)