Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/native/windows/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ Windows X86 Build

nmake CPU=X86

Windows ARM64 Build

For MVS under "C:\Program Files (x86)":
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsarm64.bat"

For MVS under "C:\Program Files":
"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsarm64.bat"

nmake CPU=ARM64


Additional configuration
========================
Expand Down
13 changes: 11 additions & 2 deletions src/native/windows/include/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Loading