winbuild: Use machine type of development environment

This patch restores the original behavior instead of always
falling back to x86 if no MACHINE-type was specified.

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index d81c6ffa98ea46570ccdd75645291da13a6c1057..222576e01e731d98e6f87481d4ddc1cb926ed151 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -32,7 +32,7 @@ CFGSET=true
 !MESSAGE   ENABLE_WINSSL=<yes or no>    - Enable native Windows SSL support, defaults to yes\r
 !MESSAGE   GEN_PDB=<yes or no>          - Generate Program Database (debug symbols for release build)\r
 !MESSAGE   DEBUG=<yes or no>            - Debug builds\r
-!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x86)
+!MESSAGE   MACHINE=<x86 or x64>         - Target architecture (default x64 on AMD64, x86 on others)
 !ERROR please choose a valid mode\r
 \r
 !ENDIF\r
@@ -55,8 +55,12 @@ ENABLE_SSPI = $(USE_SSPI)
 !ENDIF\r
 \r
 # default options\r
-!IFNDEF MACHINE
-MACHINE = x86
+!IFNDEF MACHINE\r
+!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"\r
+MACHINE = x64\r
+!ELSE
+MACHINE = x86\r
+!ENDIF
 !ENDIF
 
 !IFNDEF ENABLE_IDN\r