aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-02-21 14:03:01 +0100
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-02-21 15:41:22 +0100
commit2b735e3a224819dcbe2fdd6145f404fa7047c045 (patch)
tree79857318847a683707a20a840f620a7b2dd5d4f1 /share
parent41210b90c8d56c8726dd7d277a73b8e5248f32cf (diff)
MSVC: fix manifest resource id for DLLs
Change-Id: I18baddd6813376a655136ed82ba76fce05da1c41 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/msvc.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index ae171b055..5a730f213 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -180,7 +180,7 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries,
commands.push(cmd);
args = [
'/nologo', '/manifest', manifestFileName,
- '/outputresource:' + outputNativeFilePath + ';1'
+ "/outputresource:" + outputNativeFilePath + ";#" + (linkDLL ? "2" : "1")
]
cmd = new Command("mt.exe", args)
cmd.description = 'embedding manifest into ' + FileInfo.fileName(primaryOutput.fileName)