diff options
| author | dec05eba <dec05eba@protonmail.com> | 2017-12-13 18:35:52 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2017-12-13 18:37:07 +0100 |
| commit | 92f24893a5e2d12d0c32662483117c7032623bf1 (patch) | |
| tree | 2fac67d414383465f1257a875d7a23ab3cfd9814 /src/Conf.cpp | |
| parent | f2c70dfaba8d6481e86646080c51b6874d95f14e (diff) | |
Fix linking issue (linking in wrong order)
Change program argument handling.
Add new program argument "new" to create a new sibs project which creates
a project with all necessary files and also uses git init
(ignores failure, for example if git is not installed).
Change build path from "build" to "sibs-build" to prevent name clashing
since "build" is a common name for directories.
Diffstat (limited to 'src/Conf.cpp')
| -rw-r--r-- | src/Conf.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Conf.cpp b/src/Conf.cpp index 8dd7608..1f439cd 100644 --- a/src/Conf.cpp +++ b/src/Conf.cpp @@ -378,11 +378,15 @@ namespace sibs const StringView &packageTypeStr = value.asSingle(); if(packageTypeStr.equals("executable")) packageType = PackageType::EXECUTABLE; + else if(packageTypeStr.equals("static")) + packageType = PackageType::STATIC; + else if(packageTypeStr.equals("dynamic")) + packageType = PackageType::DYNAMIC; else if(packageTypeStr.equals("library")) packageType = PackageType::LIBRARY; else { - string errMsg = "Expected package.type to be either 'executable' or 'library', was: "; + string errMsg = "Expected package.type to be either 'executable', 'static', 'dynamic' or 'library', was: "; errMsg += string(packageTypeStr.data, packageTypeStr.size); throw ParserException(errMsg); } @@ -409,7 +413,7 @@ namespace sibs void SibsConfig::finished() { if((int)packageType == -1) - throw ParserException("Missing required config package.type. Expected to be one either 'executable' or 'library'"); + throw ParserException("Missing required config package.type. Expected to be one either 'executable', 'static', 'dynamic' or 'library'"); finishedProcessing = true; } }
\ No newline at end of file |