diff options
| author | ruki <[email protected]> | 2015-12-22 19:51:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-12-22 21:05:14 +0800 |
| commit | a1b27b37d0032904adafbeb55f3986af00fdb2e6 (patch) | |
| tree | 434eed35343be2af077602d437bb7670d6242fe6 /xmake/scripts/platform | |
| parent | b378a1f331cda1f9520b0a3d86feabb498021cb4 (diff) | |
fix setenv and arch for windows
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/windows/prober.lua | 2 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/tools/link.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/scripts/platform/windows/prober.lua b/xmake/scripts/platform/windows/prober.lua index d0cb51499..40d214efd 100644 --- a/xmake/scripts/platform/windows/prober.lua +++ b/xmake/scripts/platform/windows/prober.lua @@ -44,7 +44,7 @@ function prober._probe_arch(configs) if arch then return true end -- init the default architecture - configs.set("arch", xmake._ARCH) + configs.set("arch", "x86") -- trace utils.printf("checking for the architecture ... %s", configs.get("arch")) diff --git a/xmake/scripts/platform/windows/tools/link.lua b/xmake/scripts/platform/windows/tools/link.lua index 15d0f271e..66476fa41 100644 --- a/xmake/scripts/platform/windows/tools/link.lua +++ b/xmake/scripts/platform/windows/tools/link.lua @@ -42,7 +42,7 @@ function link.init(self, name) -- init flags for architecture local flags_arch = "" if arch == "x86" then flags_arch = "-machine:x86" - elseif arch == "x64" or arch == "amd64" then flags_arch = "-machine:x64" + elseif arch == "x64" or arch == "amd64" or arch == "x86_amd64" then flags_arch = "-machine:x64" end -- init ldflags |