generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winbuild: Use machine type of development environment

Browse Source 
This patch restores the original behavior instead of always
falling back to x86 if no MACHINE-type was specified.
This commit is contained in:
Marc Hoersken 2012-11-01 22:23:05 +01:00
parent 0ecb57056f
commit 7c0f201075
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winbuild/Makefile.vc
View File

@ -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