Fixes for Ninja on Windows

Author: nickclark2016

modules/ninja/ninja_cpp.lua

@@ -436,7 +436,7 @@ function m.getFileCxxFlags(cfg, filecfg, toolset)
 	local allExternalIncludedirs = table.join(cfg.externalincludedirs or {}, filecfg.externalincludedirs or {})
 	local allFrameworkdirs = table.join(cfg.frameworkdirs or {}, filecfg.frameworkdirs or {})
 	local allIncludedirsafter = table.join(cfg.includedirsafter or {}, filecfg.includedirsafter or {})
-	local includedirs = toolset.getincludedirs(cfg, allIncludedirs, allExternalIncludedirs, allFrameworkdirs, allIncludedirsafter)
+	local includedirs = toolset.getincludedirs(cfg, allIncludedirs, allExternalIncludedDirs, allFrameworkdirs, allIncludedirsafter)
 	flags = table.join(flags, includedirs)
 
 	local forceincludes = toolset.getforceincludes(filecfg)
@@ -539,6 +539,13 @@ function m.getLdFlags(cfg, toolset)
 		flags = table.join(flags, rpaths)
 	end
 
+	-- For MSVC shared libraries, add /IMPLIB: to specify the import library location
+	-- MSVC is Windows-only, so no need to check cfg.system
+	if cfg.kind == p.SHAREDLIB and toolset == p.tools.msc and not cfg.flags.NoImportLib then
+		local impLibPath = path.getrelative(cfg.workspace.location, cfg.linktarget.directory) .. "/" .. cfg.linktarget.name
+		table.insert(flags, "/IMPLIB:" .. impLibPath)
+	end
+	
 	return flags
 end
 
@@ -1112,7 +1119,16 @@ function m.linkTarget(cfg)
 
 	local hasPostBuild = #cfg.postbuildcommands > 0 or cfg.postbuildmessage
 
-	_p("build %s: %s %s%s", targetPath, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
+	-- For MSVC shared libraries with import libraries, list the import library as an implicit output
+	-- Dependencies will reference the .lib file (linktarget), which Ninja will know how to build.
+	-- MSVC is Windows-only, so no need to check cfg.system
+	local implicitOutputs = ""
+	if cfg.kind == p.SHAREDLIB and toolset == p.tools.msc and not cfg.flags.NoImportLib then
+		local impLibPath = path.getrelative(cfg.workspace.location, cfg.linktarget.directory) .. "/" .. cfg.linktarget.name
+		implicitOutputs = " | " .. impLibPath
+	end
+	
+	_p("build %s%s: %s %s%s", targetPath, implicitOutputs, rule, table.concat(cfg._objectFiles, " "), implicitDeps)
 
 	if cfg.kind ~= p.STATICLIB then
 		_p("  ldflags = $ldflags_%s", ninja.key(cfg))

modules/ninja/tests/_tests.lua

@@ -15,6 +15,7 @@ return {
     "test_ninja_custom_build.lua",
     "test_ninja_custom_rules.lua",
     "test_ninja_dependson.lua",
+    "test_ninja_implib.lua",
     "test_ninja_pch.lua",
     "test_ninja_perfile_config.lua",
     "test_ninja_project.lua",