diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-08-19 18:09:25 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-08-19 18:09:25 +0200 |
commit | 7436d83ef371d4fee4a66bec235e102ed80275db (patch) | |
tree | 243b416b1b6e10a43b9495121af0e57522543de0 /src/task_ar.cc | |
parent | e1030dc6e69863438fe35a628bd6af9abc814b4a (diff) |
Add support for msvc tool-chain (cl.exe/link.exe and lib.exe) on windows.
Diffstat (limited to 'src/task_ar.cc')
-rw-r--r-- | src/task_ar.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/task_ar.cc b/src/task_ar.cc index 3e1746c..3fcfcf4 100644 --- a/src/task_ar.cc +++ b/src/task_ar.cc @@ -78,13 +78,16 @@ bool TaskAR::dirtyInner() int TaskAR::runInner() { std::vector<std::string> args; - args.push_back("rcs"); - args.push_back(targetFile().string()); + //args.push_back("rcs"); for(const auto& task : getDependsTasks()) { args.push_back(task->targetFile().string()); } + args.push_back("/nologo"); + args.push_back("/SUBSYSTEM:CONSOLE"); + args.push_back("/out:"+targetFile().string()); + { // Write flags to file. std::ofstream flagsStream(flagsFile); flagsStream << flagsString(); @@ -106,7 +109,8 @@ int TaskAR::runInner() break; } - return execute(tool, args, settings.verbose > 0); + const auto& cfg = configuration(); + return execute(tool, args, cfg.env, settings.verbose > 0); } int TaskAR::clean() @@ -168,7 +172,7 @@ std::string TaskAR::flagsString() const } flagsStr += flag; } - flagsStr += "\n"; + //flagsStr += "\n"; for(const auto& dep : config.depends) { |