diff options
Diffstat (limited to 'src/GlobalLib.cpp')
| -rw-r--r-- | src/GlobalLib.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index d994a27..cbc27bc 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -126,22 +126,7 @@ namespace sibs return Result<string>::Err(errMsg); } - backend::Ninja::LibraryType libraryType; - switch(sibsConfig.getPackageType()) - { - case PackageType::STATIC: - libraryType = backend::Ninja::LibraryType::STATIC; - break; - case PackageType::DYNAMIC: - case PackageType::LIBRARY: - libraryType = backend::Ninja::LibraryType::DYNAMIC; - break; - default: - assert(false); - return Result<string>::Err("Unexpected error"); - } - - backend::Ninja ninja(libraryType); + backend::Ninja ninja; FileWalkCallbackFunc collectSourceFiles = [&ninja, &sibsConfig, &collectSourceFiles](tinydir_file *file) { if(file->is_reg) @@ -189,7 +174,7 @@ namespace sibs string libPath = buildPath; libPath += "/lib"; libPath += name; - if(libraryType == backend::Ninja::LibraryType::STATIC) + if(sibsConfig.getPackageType() == PackageType::STATIC) { libPath += ".a"; string libPathCmd = "'"; @@ -255,4 +240,4 @@ namespace sibs return Archive::extract(libArchivedFilePath.c_str(), libPath.c_str()); } -}
\ No newline at end of file +} |