From e8097bc82c73a6e1724d104f6516f0abd4a6e36b Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 2 Sep 2016 09:36:18 +0800 Subject: fix def flags for msvc --- CHANGELOG.md | 8 ++++++++ xmake/tools/link.lua | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa3d6a422..04d8f030d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ * Improve ipairs and pairs interfaces and support filter +### Bugs fixed + +* Fix `-def:xxx.def` flags failed for msvc + ## v2.0.4 ### New features @@ -162,6 +166,10 @@ * 增强ipairs和pairs接口,支持过滤器模式,简化脚本代码 +### Bugs修复 + +* 修复msvc的编译选项不支持问题:`-def:xxx.def` + ## v2.0.4 ### 新特性 diff --git a/xmake/tools/link.lua b/xmake/tools/link.lua index cacbb3eab..a5f78b4f1 100755 --- a/xmake/tools/link.lua +++ b/xmake/tools/link.lua @@ -145,6 +145,11 @@ end -- check the given flags function check(flags) + -- -def:"xxx.def"? pass directly + if flags and flags:lower():find("def:") then + return + end + -- make an stub source file local binaryfile = os.tmpfile() .. ".exe" local objectfile = os.tmpfile() .. ".obj" -- cgit v1.3.1