X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvirtualfilesystem.cpp;h=36fe1c129190e83ebd7736e7557a2619d27e9db8;hb=650560b14cac4bb35589b5b8db99197c5e1345cc;hp=b5142266edf639203755f1733598df20abc9cf8b;hpb=bf0883b6dd3946612922aa1b7c04a87d06442df7;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index b514226..36fe1c1 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -85,8 +85,13 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	const Architecture &arch = builder.get_current_arch();
 
 	list<string> shared_names;
+	bool use_import_lib = false;
 	if(mode!=BuildInfo::FORCE_STATIC)
-		shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+	{
+		shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+		if(!(use_import_lib = !shared_names.empty()))
+			shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+	}
 
 	list<string> static_names;
 	if(mode!=BuildInfo::FORCE_DYNAMIC)
@@ -108,10 +113,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 				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")
+					if(use_import_lib)
 						return new ImportLibrary(builder, filename);
 					return new SharedLibrary(builder, filename);
 				}