summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorruki <[email protected]>2015-12-22 10:47:06 +0800
committerruki <[email protected]>2015-12-22 10:47:06 +0800
commitb378a1f331cda1f9520b0a3d86feabb498021cb4 (patch)
treed934946b03468d584b48e4161df848a5a78673be /core
parente9ba9a93d79ab8163d70efbe5b78101595588971 (diff)
support windows x64 x86_amd64 amd64 arch
Diffstat (limited to 'core')
-rw-r--r--core/build.sh2
-rwxr-xr-xcore/src/xmake/machine.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/build.sh b/core/build.sh
index c9dc9292c..a424f3b26 100644
--- a/core/build.sh
+++ b/core/build.sh
@@ -3,7 +3,7 @@ if [ -f .config.mak ]; then
rm .config.mak
fi
make f DEBUG=n PLAT=msvc ARCH=x86
-make r
+make
if [ $? -ne 0 ]; then
make o
fi
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index 7e5cae462..e914297c7 100755
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -270,9 +270,9 @@ xm_machine_ref_t xm_machine_init()
// init architecture
#if defined(TB_ARCH_x86) || defined(TB_CONFIG_OS_WINDOWS)
- lua_pushstring(impl->lua, "i386");
+ lua_pushstring(impl->lua, "x86");
#elif defined(TB_ARCH_x64)
- lua_pushstring(impl->lua, "x86_64");
+ lua_pushstring(impl->lua, "x64");
#else
lua_pushstring(impl->lua, TB_ARCH_STRING);
#endif