diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 86ecfc88fd..4e7674cfd9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -335,6 +335,7 @@ COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm) !elseif "$(ARCH)" == "i386" COROUTINE_OBJ = coroutine/win32/Context.obj COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm) +!elseif "$(ARCH)" == "arm64" !else !error copy coroutine has been replaced with pthread implementation at 42130a64f02294dc8025af3a51bda518c67ab33d !endif diff --git a/win32/setup.mak b/win32/setup.mak index 8a23f9afab..275ccda3bb 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -201,7 +201,9 @@ del %0 & exit -generic-: nul @$(CPP) <nul | findstr = >>$(MAKEFILE) -#if defined _M_X64 +#if defined _M_ARM64 +MACHINE = arm64 +#elif defined _M_X64 MACHINE = x64 #else MACHINE = x86 @@ -217,6 +219,8 @@ MACHINE = x86 @echo MACHINE = x64>>$(MAKEFILE) -ix86-: -osname32- @echo MACHINE = x86>>$(MAKEFILE) +-arm64-: -osname64- + @echo MACHINE = arm64>>$(MAKEFILE) -i386-: -ix86- @echo $(CPU) = 3>>$(MAKEFILE)