diff options
Diffstat (limited to 'src/externals_manual.cc')
| -rw-r--r-- | src/externals_manual.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/externals_manual.cc b/src/externals_manual.cc index 79c9be3..3b96263 100644 --- a/src/externals_manual.cc +++ b/src/externals_manual.cc @@ -5,27 +5,30 @@ #include <map> -#include "libctor.h" +#include "ctor.h" + +#include "util.h" +#include "tools.h" extern std::map<std::string, std::string> external_includedir; extern std::map<std::string, std::string> external_libdir; -int resolv(const Settings& settings, const std::string& name, - const ExternalManual& ext, Flags& flags) +int resolv(const ctor::settings& settings, const ctor::external_configuration& config, + const ctor::external_manual& ext, ctor::flags& flags) { flags = ext.flags; - auto inc = external_includedir.find(name); + auto inc = external_includedir.find(config.name); if(inc != external_includedir.end()) { - flags.cflags.push_back("-I" + inc->second); - flags.cxxflags.push_back("-I" + 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(name); + auto lib = external_libdir.find(config.name); if(lib != external_libdir.end()) { - flags.ldflags.push_back("-L" + lib->second); + flags.ldflags.push_back({ctor::ld_opt::library_path, lib->second}); } return 0; |