summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-11-07 23:35:30 +0800
committerGitHub <[email protected]>2021-11-07 23:35:30 +0800
commite8275027282796ec9e79f24f18e8ae87ed946209 (patch)
treefc1f42de69807fd84bdeef0c91244399f4c9d445
parentc4a60cd9ec943182e4ec0258d5f9330c162181a2 (diff)
Update main.lua
-rw-r--r--xmake/actions/package/local/main.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/actions/package/local/main.lua b/xmake/actions/package/local/main.lua
index 03b2ed1ca..1a3a0a190 100644
--- a/xmake/actions/package/local/main.lua
+++ b/xmake/actions/package/local/main.lua
@@ -163,14 +163,14 @@ function _package_library(target)
on_fetch(function (package)
local result = {}
+ local libfiledir = (package:config("shared") and package:is_plat("windows", "mingw")) and "bin" or "lib"
result.links = "%s"
result.linkdirs = package:installdir("lib")
result.includedirs = package:installdir("include")
- result.libfiles = path.join(package:installdir("%s"), "%s")
+ result.libfiles = path.join(package:installdir(libfiledir), "%s")
return result
end)]], target:is_shared() and "true" or "false",
target:linkname(),
- (target:is_shared() and target:is_plat("windows", "mingw")) and "bin" or "lib",
path.filename(targetfile))
file:close()
end