diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-08 16:10:50 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-11 11:40:03 +0100 |
| commit | 9865ebd170b679712dcf3db24d38885b5dc1baa3 (patch) | |
| tree | 98620eedc7a0fba725e6612a7cc77eb7a6c314c9 /share/qbs/modules/cpp/msvc.js | |
| parent | 129c896ee16adf2c9a0fb834405b952b3f350e51 (diff) | |
fix linking of staticlibrary products with MSVC
Task-number: QBS-193
Change-Id: Ifcae8e2d47dff88c30d7f214bf9aef16ee02b1f1
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/msvc.js')
| -rw-r--r-- | share/qbs/modules/cpp/msvc.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index a51938ed5..288badb0a 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -130,7 +130,7 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, var allInputs = inputs.obj.concat(inputs.staticlibrary || []) if (inputs.dynamiclibrary_import) - allInputs = inputs.obj.concat(inputs.dynamiclibrary_import) + allInputs = allInputs.concat(inputs.dynamiclibrary_import); for (i in allInputs) { var fileName = FileInfo.toWindowsSeparators(allInputs[i].fileName) args.push(fileName) |