summaryrefslogtreecommitdiffstats
path: root/src/GvimExt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-04 20:32:24 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-04 20:32:24 +0200
commit577fadfc100ff8fa569a34b89f5ad055ad726646 (patch)
treeeedcf55923909fd9b32d48c6cc2e276f16d2e7fc /src/GvimExt
parent652de23dc7abf6aa2721ccee7fe279b5cce8069c (diff)
patch 8.1.1119: no support for Windows on ARM64.v8.1.1119
Problem: No support for Windows on ARM64. Solution: Add ARM64 support (Leendert van Doorn)
Diffstat (limited to 'src/GvimExt')
-rw-r--r--src/GvimExt/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index 27ff953e23..a865989cf7 100644
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -25,6 +25,8 @@ PLATFORM = $(TARGET_CPU)
! ifdef PLATFORM
! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
CPU = AMD64
+! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64")
+CPU = ARM64
! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
! endif
@@ -56,11 +58,17 @@ SUBSYSTEM = console
SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER)
!endif
+!if "$(CPU)" == "ARM64"
+OFFSET = 0x11C000000
+!else
+OFFSET = 0x1C000000
+!endif
+
all: gvimext.dll
gvimext.dll: gvimext.obj \
gvimext.res
- $(link) $(lflags) -dll -def:gvimext.def -base:0x1C000000 -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM)
+ $(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM)
if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2
gvimext.obj: gvimext.h