aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-03-21 14:56:51 +0100
committerdec05eba <dec05eba@protonmail.com>2018-03-21 14:58:31 +0100
commit23117906c571714b0b55caf35cf9f876d1f9fa2e (patch)
tree21574306de1efb6eafd2af48f5188bf9e3550dd8 /include
parentb44ff4ec7d2c2458aab04b5daf79134e5d284f6e (diff)
Add sub projects (should be used with git submodules)
Fix issue where static lib dependencies are not built correctly because their dynamic lib dependencies are not propagated to dependant project
Diffstat (limited to 'include')
-rw-r--r--include/Conf.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index 13245c1..6a6d07c 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -99,7 +99,7 @@ namespace sibs
class Config
{
public:
- static Result<bool> readFromFile(const _tinydir_char_t *filepath, const ConfigCallback &callback);
+ static Result<bool> readFromFile(const _tinydir_char_t *filepath, ConfigCallback &callback);
};
enum OptimizationLevel
@@ -449,6 +449,8 @@ namespace sibs
void processField(StringView name, const ConfigValue &value) override;
void finished() override;
};
+
+ void readSibsConfig(const FileString &projectPath, const FileString &projectConfFilePath, SibsConfig &sibsConfig, FileString &buildPath);
}
#endif //SIBS_CONF_HPP