This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit f09510e7aecdfdb107cb4eff2bd372c3c482c649 Author: Wolfgang Glas <[email protected]> AuthorDate: Tue Apr 7 18:58:16 2026 +0200 Add support for windows arm64 architecture to Makefile.inc --- src/native/windows/include/Makefile.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index 0ccd0b8..3e8f676 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -103,6 +103,9 @@ CPU=X86 !IF "$(BUILD_CPU)" == "AMD64" || "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64" CPU=X64 !ENDIF +!IF "$(BUILD_CPU)" == "ARM64" || "$(BUILD_CPU)" == "arm64" +CPU=ARM64 +!ENDIF # did we manage to set CPU? !IF !DEFINED(CPU) || "$(CPU)" == "" !ERROR Unexpected value of BUILD_CPU: $(BUILD_CPU) or PROCESSOR_ARCHITECTURE=$(PROCESSOR_ARCHITECTURE) or PROCESSOR_ARCHITEW6432=$(PROCESSOR_ARCHITEW6432). @@ -111,7 +114,9 @@ CPU=X64 !IF "$(CPU)" != "X86" !IF "$(CPU)" != "X64" -!ERROR Must specify CPU environment variable (X86, X64) $(CPU) +!IF "$(CPU)" != "ARM64" +!ERROR Must specify CPU environment variable (X86, X64, ARM64) $(CPU) +!ENDIF !ENDIF !ENDIF @@ -173,6 +178,10 @@ MACHINE_LC=i386 CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 MACHINE=AMD64 MACHINE_LC=amd64 +!ELSEIF "$(CPU)" == "ARM64" +CPU_CFLAGS = -D_ARM64_=1 -DWIN64 -D_WIN64 +MACHINE=ARM64 +MACHINE_LC=arm64 !ENDIF !IF "$(BUILD)" == "RELEASE" @@ -290,7 +299,7 @@ JAVA_INCLUDES=-I "$(JAVA_HOME)\include" -I "$(JAVA_HOME)\include\win32" !IF "$(CPU)" == "X86" ML = ml.exe AFLAGS = /coff /Zi /c -!ELSEIF "$(CPU)" == "X64" +!ELSEIF "$(CPU)" == "X64" || "$(CPU)" == "ARM64" ML = ml64.exe AFLAGS = /Zi /c !ENDIF
