aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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