diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-11-01 22:23:05 +0100 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2012-11-01 22:23:05 +0100 |
| commit | 7c0f201075029a7c87c5cfe84f0405bb08441fbf (patch) | |
| tree | bc1ccd7918ca3f2aec72f31bdced7b8977deb003 /winbuild | |
| parent | 0ecb57056f91c09af36e16d8112fe296565b8192 (diff) | |
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.
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/Makefile.vc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index d81c6ffa9..222576e01 100644 --- 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
!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols for release build)
!MESSAGE DEBUG=<yes or no> - Debug builds
-!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
!ENDIF
@@ -55,8 +55,12 @@ ENABLE_SSPI = $(USE_SSPI) !ENDIF
# default options
-!IFNDEF MACHINE -MACHINE = x86 +!IFNDEF MACHINE
+!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"
+MACHINE = x64
+!ELSE +MACHINE = x86
+!ENDIF !ENDIF !IFNDEF ENABLE_IDN
|