Commit 7c0f2010 authored by Marc Hoersken's avatar Marc Hoersken
Browse files

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.
parent 0ecb5705

winbuild/Makefile.vc

+7 −3
Original line number Diff line number Diff line
@@ -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
@@ -56,8 +56,12 @@ ENABLE_SSPI = $(USE_SSPI) 


# default options

!IFNDEF MACHINE

!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"

MACHINE = x64

!ELSE

MACHINE = x86

!ENDIF

!ENDIF



!IFNDEF ENABLE_IDN

USE_IDN = true