aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2019-10-30 10:58:08 +1100
committerZufu Liu <unknown>2019-10-30 10:58:08 +1100
commite6645e87a119a0837dc0be8a6068fc2f5090da91 (patch)
treead5ff9ef8444445138cdde130be732f4e8a65416
parent036a5c14841f2b128d9222737145d8a59d9acd8c (diff)
downloadscintilla-mirror-e6645e87a119a0837dc0be8a6068fc2f5090da91.tar.gz
Backport: Feature [feature-requests:#1319] Allow building for ARM64.
Backport of changeset 7744:043bf8fc5eea.
-rw-r--r--win32/scintilla.mak11
1 files changed, 7 insertions, 4 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index ec229a0cf..30cbbdc43 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -20,16 +20,19 @@ LIBSCI=$(DIR_BIN)\libscintilla.lib
LD=link
!IFDEF SUPPORT_XP
-XP_DEFINE=-D_USING_V110_SDK71_
-XP_LINK=-SUBSYSTEM:WINDOWS,5.01
+ADD_DEFINE=-D_USING_V110_SDK71_
+ADD_LINK=-SUBSYSTEM:WINDOWS,5.01
+!ELSEIFDEF ARM64
+ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+ADD_LINK=-SUBSYSTEM:WINDOWS,10.00
!ENDIF
-CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(XP_DEFINE)
+CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(ADD_DEFINE)
CXXFLAGS=-Zi -TP -MP -W4 -EHsc $(CRTFLAGS)
CXXDEBUG=-Od -MTd -DDEBUG
CXXNDEBUG=-O1 -MT -DNDEBUG -GL
NAME=-Fo
-LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(XP_LINK)
+LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(ADD_LINK)
LDDEBUG=
LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib
NOLOGO=-nologo