X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=5c548980073b9b46ac39da6982e4e5c2c8abfb66;hb=55269a63b0875be0b172453714f9190d30fb1dff;hp=ec23ef5a2e1fbf3d1c944a14dbda85e2258319d3;hpb=e943994f881a060b184aeee869a32a464f504a62;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index ec23ef5..5c54898 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -6,7 +6,7 @@
 #include "builder.h"
 #include "csourcefile.h"
 #include "executable.h"
-#include "misc.h"
+#include "importlibrary.h"
 #include "sharedlibrary.h"
 #include "staticlibrary.h"
 #include "tool.h"
@@ -97,24 +97,28 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 			FS::Path filename = *i / *j;
 			if(FileTarget *tgt = get_target(filename))
 			{
-				if(cur_names!=&shared_names || mode==BuildInfo::DYNAMIC)
-				{
-					builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
-					return tgt;
-				}
+				builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
+				return tgt;
 			}
 			else if(file_exists(filename))
 			{
 				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
 				if(cur_names==&shared_names)
+				{
+					/* XXX Hack: create ImportLibraries here; they should be handled
+					separately, but I need a more generic way of handling all these
+					filename patterns */
+					if(FS::extpart(*j)==".a")
+						return new ImportLibrary(builder, filename);
 					return new SharedLibrary(builder, filename);
+				}
 				else
 					return new StaticLibrary(builder, filename);
 			}
 
 			if(++j==cur_names->end())
 			{
-				if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)	
+				if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
 					cur_names = &static_names;
 				else if(mode==BuildInfo::STATIC && cur_names==&static_names)
 					cur_names = &shared_names;