improve zig toolchain

5 files changed, 18 insertions, 22 deletions

diff --git a/xmake/languages/fortran/api.lua b/xmake/languages/fortran/api.lua
index 53724dd2a..9adc41ceb 100644
--- a/xmake/languages/fortran/api.lua
+++ b/xmake/languages/fortran/api.lua
@@ -27,7 +27,7 @@ function apis()
         -- target.add_xxx
         "target.add_links"
     ,   "target.add_syslinks"
-    ,   "target.add_dcflags"
+    ,   "target.add_fcflags"
     ,   "target.add_ldflags"
     ,   "target.add_arflags"
     ,   "target.add_shflags"
@@ -35,7 +35,7 @@ function apis()
         -- option.add_xxx
     ,   "option.add_links"
     ,   "option.add_syslinks"
-    ,   "option.add_dcflags"
+    ,   "option.add_fcflags"
     ,   "option.add_ldflags"
     ,   "option.add_arflags"
     ,   "option.add_shflags"
@@ -43,7 +43,7 @@ function apis()
         -- package.add_xxx
     ,   "package.add_links"
     ,   "package.add_syslinks"
-    ,   "package.add_dcflags"
+    ,   "package.add_fcflags"
     ,   "package.add_ldflags"
     ,   "package.add_arflags"
     ,   "package.add_shflags"
@@ -53,7 +53,7 @@ function apis()
         -- toolchain.add_xxx
     ,   "toolchain.add_links"
     ,   "toolchain.add_syslinks"
-    ,   "toolchain.add_dcflags"
+    ,   "toolchain.add_fcflags"
     ,   "toolchain.add_ldflags"
     ,   "toolchain.add_arflags"
     ,   "toolchain.add_shflags"
diff --git a/xmake/languages/zig/api.lua b/xmake/languages/zig/api.lua
index 53724dd2a..44a339543 100644
--- a/xmake/languages/zig/api.lua
+++ b/xmake/languages/zig/api.lua
@@ -27,7 +27,7 @@ function apis()
         -- target.add_xxx
         "target.add_links"
     ,   "target.add_syslinks"
-    ,   "target.add_dcflags"
+    ,   "target.add_zcflags"
     ,   "target.add_ldflags"
     ,   "target.add_arflags"
     ,   "target.add_shflags"
@@ -35,7 +35,7 @@ function apis()
         -- option.add_xxx
     ,   "option.add_links"
     ,   "option.add_syslinks"
-    ,   "option.add_dcflags"
+    ,   "option.add_zcflags"
     ,   "option.add_ldflags"
     ,   "option.add_arflags"
     ,   "option.add_shflags"
@@ -43,32 +43,28 @@ function apis()
         -- package.add_xxx
     ,   "package.add_links"
     ,   "package.add_syslinks"
-    ,   "package.add_dcflags"
+    ,   "package.add_zcflags"
     ,   "package.add_ldflags"
     ,   "package.add_arflags"
     ,   "package.add_shflags"
     ,   "package.add_rpathdirs"
     ,   "package.add_linkdirs"
-    ,   "package.add_includedirs"
         -- toolchain.add_xxx
     ,   "toolchain.add_links"
     ,   "toolchain.add_syslinks"
-    ,   "toolchain.add_dcflags"
+    ,   "toolchain.add_zcflags"
     ,   "toolchain.add_ldflags"
     ,   "toolchain.add_arflags"
     ,   "toolchain.add_shflags"
     ,   "toolchain.add_rpathdirs"
     ,   "toolchain.add_linkdirs"
-    ,   "toolchain.add_includedirs"
     }
     _g.pathes = 
     {
         -- target.add_xxx
         "target.add_linkdirs"
-    ,   "target.add_includedirs"
         -- option.add_xxx
     ,   "option.add_linkdirs"
-    ,   "option.add_includedirs"
     }
 
     -- ok
diff --git a/xmake/languages/zig/xmake.lua b/xmake/languages/zig/xmake.lua
index ea9de1e86..f45670f16 100644
--- a/xmake/languages/zig/xmake.lua
+++ b/xmake/languages/zig/xmake.lua
@@ -53,13 +53,10 @@ language("zig")
     {
         object =
         {
-            "config.includedirs"
-        ,   "target.symbols"
+            "target.symbols"
         ,   "target.warnings"
         ,   "target.optimize:check"
         ,   "target.vectorexts:check"
-        ,   "target.includedirs"
-        ,   "toolchain.includedirs"
         }
     ,   binary =
         {
@@ -121,7 +118,6 @@ language("zig")
                 ,   {nil, "links",      "kv", nil,          "The Link Libraries"                 }
                 ,   {nil, "syslinks",   "kv", nil,          "The System Link Libraries"          }
                 ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"        }
-                ,   {nil, "includedirs","kv", nil,          "The Include Search Directories"     }
                 }
             } 
 
diff --git a/xmake/modules/detect/tools/zig/has_flags.lua b/xmake/modules/detect/tools/zig/has_flags.lua
index 3b1150afb..64661e0d2 100644
--- a/xmake/modules/detect/tools/zig/has_flags.lua
+++ b/xmake/modules/detect/tools/zig/has_flags.lua
@@ -83,7 +83,7 @@ function _check_try_running(flags, opt, islinker)
     local sourcefile = path.join(os.tmpdir(), "detect", "zig_has_flags.zig")
     local objectdir = path.join(os.tmpdir(), "detect", "zig_has_flags")
     if not os.isfile(sourcefile) then
-        io.writefile(sourcefile, "pub fn main() !void {\n}")
+        io.writefile(sourcefile, "pub fn main() !void {}")
     end
 
     -- init argv
diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua
index e46925376..cc2b927df 100644
--- a/xmake/toolchains/zig/xmake.lua
+++ b/xmake/toolchains/zig/xmake.lua
@@ -34,12 +34,16 @@ toolchain("zig")
     -- on load
     on_load(function (toolchain)
         local march
-        if is_plat("macosx") then
-            march = "x86_64-macosx-gnu"
-        elseif is_plat("linux") then
-            march = "x86_64-linux-gnu"
+        if toolchain:is_plat("macosx") then
+            march = toolchain:is_arch("x86") and "i386-macosx-gnu" or "x86_64-macosx-gnu"
+        elseif toolchain:is_plat("linux") then
+            march = toolchain:is_arch("x86") and "i386-linux-gnu" or "x86_64-linux-gnu"
+        elseif toolchain:is_plat("windows") then
+            march = toolchain:is_arch("x86") and "i386-windows-msvc" or "x86_64-windows-msvc"
         end
         if march then
             toolchain:add("zcflags", "-target", march)
+            toolchain:add("zcldflags", "-target", march)
+            toolchain:add("zcshflags", "-target", march)
         end
     end)