3 files changed, 22 insertions, 33 deletions

diff --git a/share/qbs/modules/cpp/dmc.js b/share/qbs/modules/cpp/dmc.js
index 1137a0c0a..a398d6581 100644
--- a/share/qbs/modules/cpp/dmc.js
+++ b/share/qbs/modules/cpp/dmc.js
@@ -357,12 +357,17 @@ function linkerFlags(project, product, inputs, outputs) {
                 args.push("-L/SUBSYSTEM:" + (product.consoleApplication ? "CONSOLE" : "WINDOWS"));
         } else if (product.type.contains("dynamiclibrary")) {
             args.push("-o" + FileInfo.toWindowsSeparators(outputs.dynamiclibrary[0].filePath));
+            if (product.qbs.targetPlatform === "windows" && product.qbs.architecture === "x86") {
+                args.push("kernel32.lib");
+                args.push("-L/IMPLIB:" + FileInfo.toWindowsSeparators(
+                              outputs.dynamiclibrary_import[0].filePath));
+            }
         }
 
         if (product.cpp.debugInformation)
-            args.push("/DEBUG");
+            args.push("-L/DEBUG");
 
-        args.push("/NOLOGO", "/SILENT");
+        args.push("-L/NOLOGO", "-L/SILENT");
     }
 
     // Misc flags.
@@ -432,20 +437,10 @@ function renameLinkerMapFile(project, product, inputs, outputs, input, output) {
     cmd.newMapFilePath = buildLinkerMapFilePath(target, product.cpp.linkerMapSuffix);
     cmd.oldMapFilePath = buildLinkerMapFilePath(target, ".map");
     cmd.silent = true;
-    cmd.sourceCode = function() { File.move(oldMapFilePath, newMapFilePath); };
-    return cmd;
-}
-
-// It is a workaround to generate the import library file from the dynamic library.
-// Because the DMC compiler use the separate `implib.exe` tool for that.
-function createImportLib(project, product, inputs, outputs, input, output) {
-    var args = [
-                FileInfo.toWindowsSeparators(outputs.dynamiclibrary_import[0].filePath),
-                FileInfo.toWindowsSeparators(outputs.dynamiclibrary[0].filePath)
-            ];
-    var cmd = new Command(input.cpp.implibPath, args);
-    cmd.workingDirectory = product.buildDirectory;
-    cmd.silent = true;
+    cmd.sourceCode = function() {
+        if (oldMapFilePath !== newMapFilePath)
+            File.move(oldMapFilePath, newMapFilePath);
+    };
     return cmd;
 }
 
@@ -482,16 +477,11 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
     cmd.jobPool = "linker";
     cmds.push(cmd);
 
-    if (outputs.dynamiclibrary
-            || (outputs.application && !product.cpp.generateLinkerMapFile)) {
-        if (outputs.dynamiclibrary)
-            cmds.push(createImportLib(project, product, inputs, outputs, input, output));
-        cmds.push(removeLinkerMapFile(project, product, inputs, outputs, input, output));
-    } else if (outputs.application
-               && product.cpp.generateLinkerMapFile
-               && (product.cpp.linkerMapSuffix !== ".map")) {
+    if (product.cpp.generateLinkerMapFile)
         cmds.push(renameLinkerMapFile(project, product, inputs, outputs, input, output));
-    }
+    else
+        cmds.push(removeLinkerMapFile(project, product, inputs, outputs, input, output));
+
     return cmds;
 }
 
diff --git a/share/qbs/modules/cpp/dmc.qbs b/share/qbs/modules/cpp/dmc.qbs
index f7f75169b..db9e6b2fb 100644
--- a/share/qbs/modules/cpp/dmc.qbs
+++ b/share/qbs/modules/cpp/dmc.qbs
@@ -84,8 +84,6 @@ CppModule {
 
     property string archiverName: "lib.exe"
     property string archiverPath: FileInfo.joinPaths(toolchainInstallPath, archiverName)
-    property string implibName: "implib.exe"
-    property string implibPath: FileInfo.joinPaths(toolchainInstallPath, implibName)
     property string rccCompilerName: "rcc.exe"
     property string rccCompilerPath: FileInfo.joinPaths(toolchainInstallPath, rccCompilerName)
 
diff --git a/share/qbs/modules/cpp/watcom.js b/share/qbs/modules/cpp/watcom.js
index 20ba2dbe3..005780c7d 100644
--- a/share/qbs/modules/cpp/watcom.js
+++ b/share/qbs/modules/cpp/watcom.js
@@ -80,13 +80,14 @@ function targetFlag(platform, architecture, type) {
         else if (architecture === "x86")
             return "-bos2v2";
     } else if (platform === "windows") {
-        if (architecture === "x86_16")
+        if (architecture === "x86_16") {
+            if (type.contains("dynamiclibrary"))
+                return "-bwindows_dll";
             return "-bwindows";
-        else if (architecture === "x86") {
-            if (type.contains("application"))
-                return "-bnt";
-            else if (type.contains("dynamiclibrary"))
+        } else if (architecture === "x86") {
+            if (type.contains("dynamiclibrary"))
                 return "-bnt_dll";
+            return "-bnt";
         }
     } else if (platform === "linux") {
         return "-blinux";
@@ -427,7 +428,7 @@ function linkerFlags(project, product, inputs, outputs) {
             if (product.cpp.generateLinkerMapFile)
                 args.push("-fm=" + FileInfo.toNativeSeparators(outputs.mem_map[0].filePath));
         } else if (product.type.contains("dynamiclibrary")) {
-            if (targetPlatform === "windows") {
+            if (product.qbs.targetPlatform === "windows") {
                 args.push("-Wl, option implib=" + FileInfo.toNativeSeparators(
                               outputs.dynamiclibrary_import[0].filePath));
             }