Patch 3138574: NoImportLib ignored in Windows makefiles dependencies (rjmyst3)

This commit is contained in:
Jason Perkins 2011-10-03 14:53:14 -04:00
parent 15af117ef9
commit 562746c1f4
2 changed files with 5 additions and 1 deletions

View File

@ -31,6 +31,7 @@
* Bug 3381149: Path of PCH source file in VS10 not being translated (intyuh)
* Patch 3021550: Add Wii homebrew platform (Pathogen David)
* Patch 3035550: Make/Distcc outputs dependencies to wrong location
* Patch 3138574: NoImportLib ignored in Windows makefiles dependencies (rjmyst3)
-------

View File

@ -441,7 +441,10 @@
local kind = cfg.kind
if premake.iscppproject(cfg) then
-- On Windows, shared libraries link against a static import library
if (namestyle == "windows" or system == "windows") and kind == "SharedLib" and direction == "link" then
if (namestyle == "windows" or system == "windows")
and kind == "SharedLib" and direction == "link"
and not cfg.flags.NoImportLib
then
kind = "StaticLib"
end