diff options
| author | ruki <[email protected]> | 2016-09-02 09:36:18 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-09-02 09:37:59 +0800 |
| commit | e8097bc82c73a6e1724d104f6516f0abd4a6e36b (patch) | |
| tree | 261ff81aa9d5301d2d113d83863fd781859dcfad | |
| parent | eb7401f0cf3d3039f3670c86ad05acbc7c042c39 (diff) | |
fix def flags for msvc
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rwxr-xr-x | xmake/tools/link.lua | 5 |
2 files changed, 13 insertions, 0 deletions
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" |