diff options
| author | dec05eba <dec05eba@protonmail.com> | 2017-12-13 19:58:58 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2017-12-13 19:59:04 +0100 |
| commit | c244361b8ae743bcb326b9a1a168f2fdcab491e8 (patch) | |
| tree | 0ffe9d11ebe2834546f5c4f916e2038c301bccff /backend/ninja/Ninja.hpp | |
| parent | 92f24893a5e2d12d0c32662483117c7032623bf1 (diff) | |
Change linking order for pkg-config
Linking should be added in the order of dependencies.
Modified linking logic to check global lib dir if pkg-config
fails (missing package, pkg-config is not installed or any other reason),
also required for Windows.
Diffstat (limited to 'backend/ninja/Ninja.hpp')
| -rw-r--r-- | backend/ninja/Ninja.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/ninja/Ninja.hpp b/backend/ninja/Ninja.hpp index 3ccee1e..b82139c 100644 --- a/backend/ninja/Ninja.hpp +++ b/backend/ninja/Ninja.hpp @@ -29,7 +29,7 @@ namespace backend sibs::Result<bool> build(const char *buildFilePath); private: bool containsSourceFile(const char *filepath) const; - sibs::Result<std::string> getLinkerFlags(const std::vector<sibs::Dependency> &dependencies, sibs::LinkerFlagCallbackFunc linkerFlagCallbackFunc) const; + sibs::Result<bool> getLinkerFlags(const std::vector<sibs::Dependency> &dependencies, sibs::LinkerFlagCallbackFunc linkerFlagCallbackFunc) const; private: std::vector<std::string> sourceFiles; LibraryType libraryType; |