From 99570d3fa5abf548d4e8e5e479d82ee66898b602 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sun, 10 Dec 2017 04:05:20 +0100 Subject: Add support for recursive global lib dependencies --- src/GlobalLib.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/GlobalLib.cpp') diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index 0ed34c7..41e26c1 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -53,7 +53,7 @@ namespace sibs return false; } - Result GlobalLib::getDynamicLibsLinkerFlags(const string &globalLibRootDir, const string &name, const string &version) + Result GlobalLib::getStaticLibsLinkerFlags(const string &globalLibRootDir, const string &name, const string &version, LinkerFlagCallbackFunc linkerFlagCallbackFunc) { Result packageExistsResult = validatePackageExists(globalLibRootDir, name); if(packageExistsResult.isErr()) @@ -126,7 +126,7 @@ namespace sibs // TODO: Create build path if it doesn't exist string debugBuildPath = packageDir + "/build/debug"; - Result buildFileResult = ninja.createBuildFile(sibsConfig.getPackageName(), sibsConfig.getDependencies(), debugBuildPath.c_str()); + Result buildFileResult = ninja.createBuildFile(sibsConfig.getPackageName(), sibsConfig.getDependencies(), debugBuildPath.c_str(), linkerFlagCallbackFunc); if(buildFileResult.isErr()) return Result::Err(buildFileResult.getErrMsg()); @@ -138,6 +138,7 @@ namespace sibs staticLibPath += "/lib"; staticLibPath += name; staticLibPath += ".a"; + linkerFlagCallbackFunc(staticLibPath); return Result::Ok(staticLibPath); } } \ No newline at end of file -- cgit v1.2.3