Skip to content

Commit 508ffbb

Browse files
committed
Add buildoptions, linkoptions support
1 parent 1fc5b66 commit 508ffbb

16 files changed

+2355
-209
lines changed

modules/ninja/_preload.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ newaction {
3333
elseif target == p.EMSCRIPTEN then
3434
return "emcc"
3535
elseif target == p.WINDOWS then
36-
return "v143"
36+
return "msc"
3737
else
3838
return "gcc"
3939
end

modules/ninja/ninja.lua

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ p.modules.ninja._VERSION = p._VERSION
1212

1313
local ninja = p.modules.ninja
1414

15-
--
16-
-- Escape a string so it can be written to a Ninja build file.
17-
-- Ninja variables are expanded into shell commands, so we need to escape
18-
-- shell special characters as well as Ninja special characters.
19-
--
2015
function ninja.esc(value)
2116
value = value:gsub("%$", "$$")
2217
value = value:gsub(":", "$:")
2318
value = value:gsub("\n", "$\n")
24-
value = value:gsub(" ", "$ ")
2519
value = value:gsub('%(', '\\(')
2620
value = value:gsub('%)', '\\)')
2721
value = value:gsub('"', '\\"')
22+
value = value:gsub(" ", "\\ ")
2823

2924
return value
3025
end

0 commit comments

Comments
 (0)