diff options
| author | Mark Snelling <m.snelling@solaisecapital.com> | 2012-11-14 23:19:32 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-11-14 23:20:10 +0100 |
| commit | 6d8443a24597f2dea7db431c9c6a722080a071d0 (patch) | |
| tree | 88cc32f87000a71413989bcb29478142b2ddc4fe /winbuild/Makefile.vc | |
| parent | 53c83ee3edc0a375843fca778315a55ce9c9690a (diff) | |
winbuild: Fix PDB file output
And fix some newlines to be proper CRLF
Bug: http://curl.haxx.se/bug/view.cgi?id=3586741
Diffstat (limited to 'winbuild/Makefile.vc')
| -rw-r--r-- | winbuild/Makefile.vc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 222576e01..bc93c4b50 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 x64 on AMD64, x86 on others) +!MESSAGE MACHINE=<x86 or x64> - Target architecture (default x64 on AMD64, x86 on others)
!ERROR please choose a valid mode
!ENDIF
@@ -58,11 +58,11 @@ ENABLE_SSPI = $(USE_SSPI) !IFNDEF MACHINE
!IF "$(PROCESSOR_ARCHITECTURE)"=="AMD64"
MACHINE = x64
-!ELSE +!ELSE
MACHINE = x86
-!ENDIF -!ENDIF - +!ENDIF
+!ENDIF
+
!IFNDEF ENABLE_IDN
USE_IDN = true
!ELSEIF "$(ENABLE_IDN)"=="yes"
@@ -129,8 +129,8 @@ USE_SSH2 = true SSH2 = static
!ENDIF
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-$(MACHINE) - +CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)
+
!IF "$(DEBUG)"=="yes"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
!ELSE
@@ -179,18 +179,18 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
$(MODE):
- @SET DIROBJ=$(LIBCURL_DIROBJ) + @SET DIROBJ=$(LIBCURL_DIROBJ)
@SET MACRO_NAME=LIBCURL_OBJS
@SET OUTFILE=LIBCURL_OBJS.inc
@gen_resp_file.bat $(LIBCURL_OBJS)
- - @SET 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 CONFIG_NAME_LIB=$(CONFIG_NAME_LIB)
+ @SET MACHINE=$(MACHINE)
@SET USE_IDN=$(USE_IDN)
@SET USE_IPV6=$(USE_IPV6)
@SET USE_SSPI=$(USE_SSPI)
|