diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-04 16:19:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-04 16:19:25 (GMT) |
| commit | 8be8b508867864add7ba4793c6b856384ef8b873 (patch) | |
| tree | 715582211561404bab8969119c458c348799737f /win/rules.vc | |
| parent | 7b1d345686119335c547557b1029df64b0d3c5c5 (diff) | |
| download | tcl-8be8b508867864add7ba4793c6b856384ef8b873.zip tcl-8be8b508867864add7ba4793c6b856384ef8b873.tar.gz tcl-8be8b508867864add7ba4793c6b856384ef8b873.tar.bz2 | |
See [https://github.com/tcltk/tcl/pull/10]
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/win/rules.vc b/win/rules.vc index 8a91b58..37723c8 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -435,6 +435,8 @@ VCVER=0 && ![echo ARCH=IX86 >> vercl.x] \
&& ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
&& ![echo ARCH=AMD64 >> vercl.x] \
+ && ![echo $(_HASH)elif defined(_M_ARM64) >> vercl.x] \
+ && ![echo ARCH=ARM64 >> vercl.x] \
&& ![echo $(_HASH)endif >> vercl.x] \
&& ![$(cc32) -nologo -TC -P vercl.x 2>NUL]
!include vercl.i
@@ -490,6 +492,8 @@ MULTIPLATFORM_INSTALL = 0 !if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]
NATIVE_ARCH=IX86
+!if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i ARM | findstr /i 64-bit]
+NATIVE_ARCH=ARM64
!else
NATIVE_ARCH=AMD64
!endif
@@ -1476,6 +1480,11 @@ carch = /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE carch =
!endif
+# cpuid is only available on intel machines
+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "AMD64"
+carch = $(carch) /DHAVE_CPUID=1
+!endif
+
!if $(DEBUG)
# Turn warnings into errors
cwarn = $(cwarn) -WX
|