X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=5c548980073b9b46ac39da6982e4e5c2c8abfb66;hb=33202532d4afbebdef4047f6bd216eca22d27813;hp=f1a0adb7b633c78a6b16896be775a65ba5f497fd;hpb=b58e16b078df97d8aabf64a8e4d0d8ce37ad3877;p=builder.git diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp index f1a0adb..5c54898 100644 --- a/source/virtualfilesystem.cpp +++ b/source/virtualfilesystem.cpp @@ -6,6 +6,7 @@ #include "builder.h" #include "csourcefile.h" #include "executable.h" +#include "importlibrary.h" #include "sharedlibrary.h" #include "staticlibrary.h" #include "tool.h" @@ -104,9 +105,11 @@ 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 StaticLibrary targets for import libraries + /* 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 StaticLibrary(builder, filename); + return new ImportLibrary(builder, filename); return new SharedLibrary(builder, filename); } else @@ -115,7 +118,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath 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;