From 8f61e5cea74cdeb7564bf2ac3ca7411200a38af9 Mon Sep 17 00:00:00 2001 From: Sapien2 Date: Thu, 25 Oct 2012 12:19:50 +0400 Subject: Architecture selection for winbuild and minor makefiles refactoring --- winbuild/Makefile.vc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'winbuild/Makefile.vc') diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 137be213a..fcffc7411 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -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) -- cgit v1.2.3