diff options
author | dec05eba <dec05eba@protonmail.com> | 2018-10-01 04:51:42 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:33 +0200 |
commit | e2d947ccd6947c9190569fedbb4a90505b5fe9a5 (patch) | |
tree | 943167a2aae91af3164e5cd80a96b08826952d23 /src/GlobalLib.cpp | |
parent | 63cedcab19474cae0a4b1322600355ddc23d56d0 (diff) |
Allow specifying project platform without arch
Diffstat (limited to 'src/GlobalLib.cpp')
-rw-r--r-- | src/GlobalLib.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index 9921c1b..916ba3e 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -205,9 +205,6 @@ namespace sibs if (result.isErr()) return result; - if(sibsConfig.getPackageName().empty()) - return Result<bool>::Err("project.conf is missing required field package.name"); - if(sibsConfig.getPackageType() == PackageType::EXECUTABLE) { string errMsg = "The dependency "; @@ -215,16 +212,6 @@ namespace sibs errMsg += " is an executable. Only libraries can be dependencies"; return Result<bool>::Err(errMsg); } - - if (!containsPlatform(sibsConfig.getPlatforms(), SYSTEM_PLATFORM)) - { - string errMsg = "The dependency "; - errMsg += dependencyName; - errMsg += " does not support your platform ("; - errMsg += asString(SYSTEM_PLATFORM); - errMsg += ")"; - return Result<bool>::Err(errMsg); - } FileString buildPath = packageDir + TINYDIR_STRING("/sibs-build/"); switch (sibsConfig.getOptimizationLevel()) @@ -272,7 +259,7 @@ namespace sibs Result<bool> GlobalLib::downloadDependency(PackageListDependency *dependency) { - Result<string> packageUrlResult = Package::getPackageUrl(dependency->name.c_str(), dependency->version.c_str(), SYSTEM_PLATFORM_NAME); + Result<string> packageUrlResult = Package::getPackageUrl(dependency->name.c_str(), dependency->version.c_str(), SYSTEM_PLATFORM); if(!packageUrlResult) return Result<bool>::Err(packageUrlResult); |