diff options
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 04fc3da5c..f5dd19d5d 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -54,7 +54,7 @@ CppModule { compilerDefines: ['_WIN32'] warningLevel: "default" compilerName: "cl.exe" - property string assemblerName: { + assemblerName: { switch (qbs.architecture) { case "armv7": return "armasm.exe"; @@ -330,7 +330,9 @@ CppModule { FileInfo.toWindowsSeparators(input.filePath)]; if (ModUtils.moduleProperty(product, "debugInformation")) args.push("/Zi"); - var cmd = new Command(ModUtils.moduleProperty(product, "assemblerName"), args); + args = args.concat(ModUtils.moduleProperties(input, 'platformFlags', 'asm'), + ModUtils.moduleProperties(input, 'flags', 'asm')); + var cmd = new Command(ModUtils.moduleProperty(product, "assemblerPath"), args); cmd.description = "assembling " + input.fileName; cmd.inputFileName = input.fileName; cmd.stdoutFilterFunction = function(output) { |