fix emcc for windows

4 files changed, 14 insertions, 10 deletions

diff --git a/xmake/modules/detect/tools/find_emar.lua b/xmake/modules/detect/tools/find_emar.lua
index ef4ce81b5..cd1e47bda 100644
--- a/xmake/modules/detect/tools/find_emar.lua
+++ b/xmake/modules/detect/tools/find_emar.lua
@@ -63,5 +63,5 @@ function main(opt)
     opt.check = opt.check or _check
 
     -- find program
-    return find_program(opt.program or "emar", opt)
+    return find_program(opt.program or (is_host("windows") and "emar.bat" or "emar"), opt)
 end
diff --git a/xmake/modules/detect/tools/find_emcc.lua b/xmake/modules/detect/tools/find_emcc.lua
index 2eda7543c..90eafed91 100644
--- a/xmake/modules/detect/tools/find_emcc.lua
+++ b/xmake/modules/detect/tools/find_emcc.lua
@@ -41,7 +41,7 @@ function main(opt)
     opt = opt or {}
 
     -- find program
-    local program = find_program(opt.program or "emcc", opt)
+    local program = find_program(opt.program or (is_host("windows") and "emcc.bat" or "emcc"), opt)
 
     -- find program version
     local version = nil
diff --git a/xmake/modules/detect/tools/find_emxx.lua b/xmake/modules/detect/tools/find_emxx.lua
index 6adaea5c9..1c9fe5840 100644
--- a/xmake/modules/detect/tools/find_emxx.lua
+++ b/xmake/modules/detect/tools/find_emxx.lua
@@ -41,7 +41,7 @@ function main(opt)
     opt = opt or {}
 
     -- find program
-    local program = find_program(opt.program or "em++", opt)
+    local program = find_program(opt.program or (is_host("windows") and "em++.bat" or "em++"), opt)
 
     -- find program version
     local version = nil
diff --git a/xmake/toolchains/emcc/xmake.lua b/xmake/toolchains/emcc/xmake.lua
index 0d0901865..a74303b61 100644
--- a/xmake/toolchains/emcc/xmake.lua
+++ b/xmake/toolchains/emcc/xmake.lua
@@ -27,15 +27,18 @@ toolchain("emcc")
 
     -- mark as standalone toolchain
     set_kind("standalone")
+
+    -- add suffix for windows
+    local suffix = is_host("windows") and ".bat" or ""
         
     -- set toolset
-    set_toolset("cc", "emcc")
-    set_toolset("cxx", "emcc", "em++")
-    set_toolset("ld", "em++", "emcc")
-    set_toolset("sh", "em++", "emcc")
-    set_toolset("ar", "emar")
-    set_toolset("ex", "emar")
-    set_toolset("as", "emcc")
+    set_toolset("cc", "emcc" .. suffix)
+    set_toolset("cxx", "emcc" .. suffix, "em++" .. suffix)
+    set_toolset("ld", "em++" .. suffix, "emcc" .. suffix)
+    set_toolset("sh", "em++" .. suffix, "emcc" .. suffix)
+    set_toolset("ar", "emar" .. suffix)
+    set_toolset("ex", "emar" .. suffix)
+    set_toolset("as", "emcc" .. suffix)
 
     -- check toolchain
     on_check(function (toolchain)
@@ -49,3 +52,4 @@ toolchain("emcc")
         toolchain:add("ldflags", "")
         toolchain:add("shflags", "")
     end)
+