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

Architecture selection for winbuild and minor makefiles refactoring

Browse Source
This commit is contained in:
Sapien2
2012-10-25 12:19:50 +04:00
committed by Marc Hoersken
parent 34ff881ece
commit 8f61e5cea7
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winbuild/Makefile.vc
View File

@@ -54,6 +54,10 @@ ENABLE_SSPI = $(USE_SSPI)
!ENDIF
# default options
!IFNDEF MACHINE
MACHINE = X86
!ENDIF
!IFNDEF ENABLE_IDN
USE_IDN = true
!ELSEIF "$(ENABLE_IDN)"=="yes"
@@ -120,6 +124,8 @@ USE_SSH2 = true
SSH2 = static
!ENDIF
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-$(MACHINE)
!IF "$(DEBUG)"=="yes"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
!ELSE
@@ -168,14 +174,18 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
$(MODE):
@SET LIBCURL_DIROBJ=$(LIBCURL_DIROBJ)
@SET DIROBJ=$(LIBCURL_DIROBJ)
@SET MACRO_NAME=LIBCURL_OBJS
@SET OUTFILE=LIBCURL_OBJS.inc
@gen_resp_file.bat $(LIBCURL_OBJS)
@SET LIBCURL_DIROBJ=$(CURL_DIROBJ)
@SET DIROBJ=$(CURL_DIROBJ)
@SET MACRO_NAME=CURL_OBJS
@SET OUTFILE=CURL_OBJS.inc
@gen_resp_file.bat $(CURL_OBJS)
@SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
@SET MACHINE=$(MACHINE)
@SET USE_IDN=$(USE_IDN)
@SET USE_IPV6=$(USE_IPV6)
@SET USE_SSPI=$(USE_SSPI)