summaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorSimon Warta <simon@kullo.net>2017-02-16 17:27:03 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-02-16 17:56:33 +0100
commit3cc30e8207b5ab3a9a381c0ff3584d1af8dc54a1 (patch)
treed9a1cda6147635e380930cb9dc48b08f62e7d1bc /winbuild
parent62c857acd60efbd1f3051fa78e6f2a790ca8f624 (diff)
downloadcurl-3cc30e8207b5ab3a9a381c0ff3584d1af8dc54a1.tar.gz
winbuild: add note on auto-detection of MACHINE in Makefile.vc
Closes #1265
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/Makefile.vc3
1 files changed, 3 insertions, 0 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 1443dfa02..f78da4343 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -57,7 +57,10 @@ ENABLE_SSPI = $(USE_SSPI)
!ENDIF
# default options
+
!IFNDEF MACHINE
+# Note: nmake magically changes the value of PROCESSOR_ARCHITECTURE from "AMD64"
+# to "x86" when building in a 32 bit build environment on a 64 bit machine.
!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"
MACHINE = x64
!ELSE