diff options
Diffstat (limited to 'src/GlobalLib.cpp')
| -rw-r--r-- | src/GlobalLib.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index db85abd..fde7797 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -138,22 +138,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) @@ -201,7 +186,7 @@ namespace sibs buildPath += TINYDIR_STRING("release"); break; } - + string libPath = toUtf8(buildPath); switch (sibsConfig.getCompiler()) { @@ -209,7 +194,7 @@ namespace sibs { libPath += "/lib"; libPath += name; - if (libraryType == backend::Ninja::LibraryType::STATIC) + if (sibsConfig.getPackageType() == PackageType::STATIC) { libPath += ".a"; string libPathCmd = "'"; @@ -231,7 +216,7 @@ namespace sibs { libPath += "/"; libPath += name; - if (libraryType == backend::Ninja::LibraryType::STATIC) + if (sibsConfig.getPackageType() == PackageType::STATIC) { libPath += ".lib"; string libPathCmd = "\""; |