diff options
Diffstat (limited to 'src/externals_manual.cc')
| -rw-r--r-- | src/externals_manual.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/externals_manual.cc b/src/externals_manual.cc index 0e3cdfd..3b96263 100644 --- a/src/externals_manual.cc +++ b/src/externals_manual.cc @@ -5,7 +5,7 @@ #include <map> -#include "libctor.h" +#include "ctor.h" #include "util.h" #include "tools.h" @@ -13,24 +13,22 @@ extern std::map<std::string, std::string> external_includedir; extern std::map<std::string, std::string> external_libdir; -int resolv(const Settings& settings, const ExternalConfiguration& config, - const ExternalManual& ext, Flags& flags) +int resolv(const ctor::settings& settings, const ctor::external_configuration& config, + const ctor::external_manual& ext, ctor::flags& flags) { - auto tool_chain = getToolChain(config.system); - flags = ext.flags; auto inc = external_includedir.find(config.name); if(inc != external_includedir.end()) { - append(flags.cflags, getOption(tool_chain, opt::include_path, inc->second)); - append(flags.cxxflags, getOption(tool_chain, opt::include_path, inc->second)); + flags.cflags.push_back({ctor::c_opt::include_path, inc->second}); + flags.cxxflags.push_back({ctor::cxx_opt::include_path, inc->second}); } auto lib = external_libdir.find(config.name); if(lib != external_libdir.end()) { - append(flags.ldflags, getOption(tool_chain, opt::library_path, lib->second)); + flags.ldflags.push_back({ctor::ld_opt::library_path, lib->second}); } return 0; |