diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-07-14 18:01:24 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-07-14 18:01:24 +0800 |
| commit | ae0e0617b8f1425e177acce3532173b4c8155d81 (patch) | |
| tree | af94f87e36a370d6fdab21aece71f7c06040157a /win32 | |
| parent | 96c934a0c4194469c05e2f2673494985ac07b82d (diff) | |
| download | adwaita-icon-theme-ae0e0617b8f1425e177acce3532173b4c8155d81.tar.gz | |
Visual Studio builds: Support ARM64 builds better
Add detection logic for ARM64 builds, so that we can construct a default prefix
for such builds easier. Also make Visual Studio 2017 and 2019 builds distinct
from 2015 builds.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/detectenv-msvc.mak | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak index 6fd96ccc6..29b73d88b 100644 --- a/win32/detectenv-msvc.mak +++ b/win32/detectenv-msvc.mak @@ -21,6 +21,8 @@ _HASH=^# && ![echo PLAT=Win32 >> vercl.x] \ && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ && ![echo PLAT=x64 >> vercl.x] \ + && ![echo $(_HASH)elif defined(_M_ARM64) >> vercl.x] \ + && ![echo PLAT=arm64 >> vercl.x] \ && ![echo $(_HASH)endif >> vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNUL)] !include vercl.i @@ -42,8 +44,10 @@ VSVER = 11 VSVER = 12 !elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000 +!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920 VSVER = 15 +!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 +VSVER = 16 !else VSVER = 0 !endif @@ -51,7 +55,7 @@ VSVER = 0 !if "$(VSVER)" == "0" MSG = ^ This NMake Makefile set supports Visual Studio^ -9 (2008) through 14 (2015). Your Visual Studio^ +9 (2008) through 16 (2019). Your Visual Studio^ version is not supported. !error $(MSG) !endif @@ -73,6 +77,8 @@ CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) !if "$(PLAT)" == "x64" LDFLAGS_ARCH = /machine:x64 +!elseif "$(PLAT)" == "arm64" +LDFLAGS_ARCH = /machine:arm64 !else LDFLAGS_ARCH = /machine:x86 !endif |