Skip to content
Merged
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
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,7 @@ Niko Tyni <ntyni@debian.org>
Nikola Knezevic <indy@tesla.rcub.bg.ac.yu>
Nikola Milutinovic
Nikolai Eipel <eipel@web.de>
Niyas Sait <niyas.sait@linaro.org>
Noah <sitz@onastick.net>
Nobuhiro Iwamatsu
Noirin Shirley <colmsbook@nerdchic.net>
Expand Down
9 changes: 7 additions & 2 deletions win32/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ PROCESSOR_ARCHITECTURE = x86
! IF "$(PROCESSOR_ARCHITEW6432)" != ""
PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITEW6432)
WIN64 = define
! ELSEIF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "IA64"
! ELSEIF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "IA64" || "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
WIN64 = define
! ELSE
WIN64 = undef
Expand All @@ -332,10 +332,13 @@ USE_64_BIT_INT = define
!ENDIF

ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)

!IF "$(ARCHITECTURE)" == "AMD64"
ARCHITECTURE = x64
!ELSEIF "$(ARCHITECTURE)" == "IA64"
ARCHITECTURE = ia64
!ELSEIF "$(ARCHITECTURE)" == "ARM64"
ARCHITECTURE = arm64
!ENDIF

!IF "$(USE_MULTI)" == "define"
Expand Down Expand Up @@ -374,7 +377,9 @@ CCLIBDIR = $(CCHOME)\lib\amd64
CCLIBDIR = $(CCHOME)\lib
! ENDIF
!ELSE
! IF "$(WIN64)" == "define"
! IF "$(ARCHITECTURE)" == "arm64"
CCLIBDIR = $(CCHOME)\lib\arm64
! ELSEIF "$(WIN64)" == "define"
CCLIBDIR = $(CCHOME)\lib\x64
! ELSE
CCLIBDIR = $(CCHOME)\lib\x86
Expand Down