From c158ed407067526ba74471c6e6bbf2b66eddecc7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 3 Dec 2018 13:28:46 +0100 Subject: MSVC: Fix handling of intermediate objects Amends 2e830e5e4f. Change-Id: Ifecc822412c481d45121fa7d792e1fb2aa4e2064 Reviewed-by: Joerg Bornemann --- share/qbs/modules/cpp/msvc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 2e2c28c49..1864c40e1 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -188,7 +188,8 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli if (product.cpp.debugInformation && product.cpp.separateDebugInformation) args.push("/Fd" + product.targetName + ".cl" + product.cpp.debugInfoSuffix); - var objOutput = outputs.obj ? outputs.obj[0] : undefined + var objectMap = outputs.obj || outputs.intermediate_obj + var objOutput = objectMap ? objectMap[0] : undefined args.push('/Fo' + FileInfo.toWindowsSeparators(objOutput.filePath)) args.push(FileInfo.toWindowsSeparators(input.filePath)) -- cgit v1.2.3