Get rid of the Library and SystemLibrary classes as unnecessary abstractions

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 7febdb62b78c58d3e3ca0813ea526d12284e6798..fe0159e857d61892ee7cc055bacedcc40d00b303 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -5,7 +5,7 @@
 #include "csourcefile.h"
 #include "misc.h"
 #include "sharedlibrary.h"
-#include "systemlibrary.h"
+#include "staticlibrary.h"
 #include "virtualfilesystem.h"
 
 using namespace std;
@@ -168,7 +168,7 @@ FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &pa
                {
                        FileTarget *tgt = get_target(fn);
                        if(!tgt)
-                               return new SystemLibrary(builder, fn.str());
+                               return new SharedLibrary(builder, fn);
                        else if(mode==DYNAMIC || !tgt->get_package())
                                return tgt;
                }
@@ -182,7 +182,7 @@ FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &pa
                if(FileTarget *tgt = get_target(fn))
                        return tgt;
                else
-                       return new SystemLibrary(builder, fn.str());
+                       return new StaticLibrary(builder, fn);
        }
 
        return 0;