summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-05 16:06:45 +0800
committerruki <[email protected]>2015-06-05 16:06:45 +0800
commit411e3138ec53ab99c73f0124ef93ac98d746cdc9 (patch)
treed7e719ea57e12402f630deb1ed998a00304510ff /xmake/scripts/platform
parentfe68854c321f2e586cab55dce6856b89241b4c20 (diff)
join flags for compiler and linker
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/windows/tools/cl.lua4
-rw-r--r--xmake/scripts/platform/windows/tools/link.lua11
2 files changed, 10 insertions, 5 deletions
diff --git a/xmake/scripts/platform/windows/tools/cl.lua b/xmake/scripts/platform/windows/tools/cl.lua
index a8ab807a7..24c45bec3 100644
--- a/xmake/scripts/platform/windows/tools/cl.lua
+++ b/xmake/scripts/platform/windows/tools/cl.lua
@@ -32,10 +32,10 @@ local config = require("base/config")
function cl.init(name)
-- init cflags
- cl.cflags = "-nologo"
+ cl.cflags = { "-nologo" }
-- init cxxflags
- cl.cxxflags = "-nologo"
+ cl.cxxflags = { "-nologo" }
end
diff --git a/xmake/scripts/platform/windows/tools/link.lua b/xmake/scripts/platform/windows/tools/link.lua
index 52528ca6c..5ccd8945e 100644
--- a/xmake/scripts/platform/windows/tools/link.lua
+++ b/xmake/scripts/platform/windows/tools/link.lua
@@ -42,13 +42,18 @@ function link.init(name)
end
-- init ldflags
- link.ldflags = "-nologo -dynamicbase -nxcompat -manifest -manifestuac:\"level='asInvoker' uiAccess='false'\" " .. flags_arch
+ link.ldflags = { "-nologo"
+ , "-dynamicbase"
+ , "-nxcompat"
+ , "-manifest"
+ , "-manifestuac:\"level='asInvoker' uiAccess='false'\""
+ , flags_arch}
-- init arflags
- link.arflags = "-lib -nologo " .. flags_arch
+ link.arflags = {"-lib", "-nologo", flags_arch}
-- init shflags
- link.shflags = "-dll -nologo " .. flags_arch
+ link.shflags = {"-dll", "-nologo", flags_arch}
end
-- make the linker command