diff options
| author | ruki <[email protected]> | 2023-03-27 17:03:56 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-03-27 17:03:56 +0800 |
| commit | 3f94114c7d062967a9622a4dc5fca1ec5f80e690 (patch) | |
| tree | cb1d9c9435fc5d54261b3fc4d67f5f599522cb1c /xmake/modules | |
| parent | 6eb7f2203ad50d475e6e720b1506e9c046b43cdd (diff) | |
| parent | feb5d21a6e9a0b657c659a8d28840147fbd5c62d (diff) | |
Merge pull request #3563 from pdagobert/improve-d-projects
Improve d projects
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/core/tools/dmd.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/ldc2.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/manager/dub/find_package.lua | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua index 99e872390..e02a1ed0a 100644 --- a/xmake/modules/core/tools/dmd.lua +++ b/xmake/modules/core/tools/dmd.lua @@ -72,7 +72,7 @@ function nf_strip(self, level) end -- make the symbol flag -function nf_symbol(self, level) +function nf_symbol(self, level, target) local kind = self:kind() if language.sourcekinds()[kind] then local maps = _g.symbol_maps @@ -83,6 +83,8 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] + elseif (kind == "dcld" or kind == "dcsh") and target:is_plat("windows") and level == "debug" then + return "-g" end end diff --git a/xmake/modules/core/tools/ldc2.lua b/xmake/modules/core/tools/ldc2.lua index 3a2dbf160..5a9f77026 100644 --- a/xmake/modules/core/tools/ldc2.lua +++ b/xmake/modules/core/tools/ldc2.lua @@ -49,7 +49,7 @@ function nf_optimize(self, level) end -- make the symbol flag -function nf_symbol(self, level) +function nf_symbol(self, level, target) local kind = self:kind() if language.sourcekinds()[kind] then local maps = _g.symbol_maps @@ -61,5 +61,7 @@ function nf_symbol(self, level) _g.symbol_maps = maps end return maps[level .. '_' .. kind] or maps[level] + elseif (kind == "dcld" or kind == "dcsh") and target:is_plat("windows") and level == "debug" then + return "-g" end end diff --git a/xmake/modules/package/manager/dub/find_package.lua b/xmake/modules/package/manager/dub/find_package.lua index 5d49d695e..372e6bbcf 100644 --- a/xmake/modules/package/manager/dub/find_package.lua +++ b/xmake/modules/package/manager/dub/find_package.lua @@ -49,7 +49,7 @@ function main(name, opt) if pkglist then local pkgdir for _, line in ipairs(pkglist:split('\n', {plain = true})) do - local pkginfo = line:split(':', {plain = true}) + local pkginfo = line:split(': ', {plain = true}) if #pkginfo == 2 then local pkgkey = pkginfo[1]:trim():split(' ', {plain = true}) local pkgpath = pkginfo[2]:trim() |