diff options
| author | ruki <[email protected]> | 2020-05-29 00:57:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-05-28 23:43:01 +0800 |
| commit | 3233f53139341e09a4a02e31f02aeab7597c7157 (patch) | |
| tree | 37b7e5c2956bfb838bdc04589d7548e69cd9856e | |
| parent | 48d424f2621c1eac563d642ef05c5b34c8d12d2c (diff) | |
improve mingw toolchain
| -rw-r--r-- | xmake/toolchains/mingw/xmake.lua | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua index 10a9b2ffa..c06e1c251 100644 --- a/xmake/toolchains/mingw/xmake.lua +++ b/xmake/toolchains/mingw/xmake.lua @@ -31,7 +31,14 @@ toolchain("mingw") import("core.project.config") -- get cross - local cross = config.get("cross") or "" + local cross + if is_arch("x86_64") then + cross = "x86_64-w64-mingw32-" + elseif is_arch("i386") then + cross = "i686-w64-mingw32-" + else + cross = config.get("cross") or "" + end -- TODO add to environment module -- add bin search library for loading some dependent .dll files windows @@ -47,9 +54,9 @@ toolchain("mingw") toolchain:set("toolsets", "as", cross .. "gcc") toolchain:set("toolsets", "ld", cross .. "g++", cross .. "gcc") toolchain:set("toolsets", "sh", cross .. "g++", cross .. "gcc") - toolchain:set("toolsets", "ar", cross .. "ar") - toolchain:set("toolsets", "ex", cross .. "ar") - toolchain:set("toolsets", "ranlib", cross .. "ranlib") + toolchain:set("toolsets", "ar", cross .. "ar", cross .. "gcc-ar") + toolchain:set("toolsets", "ex", cross .. "ar", cross .. "gcc-ar") + toolchain:set("toolsets", "ranlib", cross .. "ranlib", cross .. "gcc-ranlib") toolchain:set("toolsets", "mrc", cross .. "windres") -- init flags for architecture |