diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-03-01 21:54:52 -0500 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-12 11:30:12 +0100 |
| commit | ebdce31cb5762be3b0fa2fdabd03f57d6d159236 (patch) | |
| tree | a89eeb88e78878ae03f0e5d7970107368d23ded6 /share/qbs/modules/cpp/windows-msvc.qbs | |
| parent | 60bdacc73cc9589733d074cfd6c2a729aef59ecc (diff) | |
Add the input file's extension when generating .o filenames.
Old behavior (conflict):
main.cpp -> main.o
main.mm -> main.o
New behavior (no conflict; same behavior as CMake):
main.cpp -> main.cpp.o
main.mm -> main.mm.o
Task-number: QBS-211
Change-Id: I27c71ffe368a2191c56fc0fc34089a6ad7ec8f61
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 23ec1dfca..5039fc91f 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -96,9 +96,9 @@ CppModule { Artifact { fileTags: ['obj'] // ### make the object file dir overridable - fileName: ".obj/" + product.name + "/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + ".obj" + fileName: ".obj/" + product.name + "/" + input.baseDir.replace(':', '') + "/" + input.fileName + ".obj" } - + prepare: { var platformDefines = ModUtils.moduleProperties(input, 'platformDefines'); var defines = ModUtils.moduleProperties(input, 'defines'); |