Commit 6d8443a2 authored by Mark Snelling's avatar Mark Snelling Committed by Daniel Stenberg
Browse files

winbuild: Fix PDB file output 

And fix some newlines to be proper CRLF

Bug: http://curl.haxx.se/bug/view.cgi?id=3586741
parent 53c83ee3

winbuild/Makefile.vc

+13 −13
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 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

winbuild/MakefileBuild.vc

+34 −19
Original line number Diff line number Diff line
@@ -67,12 +67,23 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf 
CFLAGS_LIBCURL_STATIC  = /DCURL_STATICLIB



WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib

LIB_NAME_STATIC        = libcurl_a.lib

LIB_NAME_STATIC_DEBUG  = libcurl_a_debug.lib

LIB_NAME_DLL           = libcurl.dll

LIB_NAME_IMP           = libcurl.lib

LIB_NAME_DLL_DEBUG     = libcurl_debug.dll

LIB_NAME_IMP_DEBUG     = libcurl_debug.lib



BASE_NAME              = libcurl

BASE_NAME_DEBUG        = $(BASE_NAME)_debug

BASE_NAME_STATIC       = $(BASE_NAME)_a

BASE_NAME_STATIC_DEBUG = $(BASE_NAME_STATIC)_debug



LIB_NAME_STATIC        = $(BASE_NAME_STATIC).lib

LIB_NAME_STATIC_DEBUG  = $(BASE_NAME_STATIC_DEBUG).lib

LIB_NAME_DLL           = $(BASE_NAME).dll

LIB_NAME_IMP           = $(BASE_NAME).lib

LIB_NAME_DLL_DEBUG     = $(BASE_NAME_DEBUG).dll

LIB_NAME_IMP_DEBUG     = $(BASE_NAME_DEBUG).lib



PDB_NAME_STATIC        = $(BASE_NAME_STATIC).pdb

PDB_NAME_STATIC_DEBUG  = $(BASE_NAME_STATIC_DEBUG).pdb

PDB_NAME_DLL           = $(BASE_NAME).pdb

PDB_NAME_DLL_DEBUG     = $(BASE_NAME_DEBUG).pdb



# CURL Command section

PROGRAM_NAME = curl.exe
@@ -266,10 +277,12 @@ LNK = $(LNKDLL) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET) 
!IF "$(DEBUG)"=="yes"

TARGET    = $(LIB_NAME_DLL_DEBUG)

LNK       = $(LNK) /DEBUG /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_DEBUG)

PDB       = $(PDB_NAME_DLL_DEBUG)

CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_DEBUG)

!ELSE

TARGET    = $(LIB_NAME_DLL)

LNK       = $(LNK)  /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)

PDB       = $(PDB_NAME_DLL)

CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)

!ENDIF

RESOURCE  = $(LIB_DIROBJ)\libcurl.res
@@ -279,8 +292,10 @@ RESOURCE = $(LIB_DIROBJ)\libcurl.res 


!IF "$(DEBUG)"=="yes"

TARGET   = $(LIB_NAME_STATIC_DEBUG)

PDB      = $(PDB_NAME_STATIC_DEBUG)

!ELSE

TARGET   = $(LIB_NAME_STATIC)

PDB      = $(PDB_NAME_STATIC)

!ENDIF

LNK      = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)

CC       = $(CC) $(CFLAGS_LIBCURL_STATIC)
@@ -320,7 +335,7 @@ CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS) 
!ENDIF



!IF "$(GEN_PDB)"=="true"

CFLAGS = $(CFLAGS) $(CFLAGS_PDB)

CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"

LFLAGS = $(LFLAGS) $(LFLAGS_PDB)

!ENDIF