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

winbuild: Fix PDB file output

Browse Source 
And fix some newlines to be proper CRLF

Bug: http://curl.haxx.se/bug/view.cgi?id=3586741
This commit is contained in:
Mark Snelling
2012-11-14 23:19:32 +01:00
committed by Daniel Stenberg
parent 53c83ee3ed
commit 6d8443a245
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winbuild/Makefile.vc
View File

@@ -129,7 +129,7 @@ USE_SSH2 = true
SSH2 = static SSH2 = static
!ENDIF !ENDIF
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-$(MACHINE) CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-vc$(VC)-$(MACHINE)
!IF "$(DEBUG)"=="yes" !IF "$(DEBUG)"=="yes"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug

33
winbuild/MakefileBuild.vc
View File

@@ -67,12 +67,23 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf
CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB
WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib
LIB_NAME_STATIC = libcurl_a.lib
LIB_NAME_STATIC_DEBUG = libcurl_a_debug.lib BASE_NAME = libcurl
LIB_NAME_DLL = libcurl.dll BASE_NAME_DEBUG = $(BASE_NAME)_debug
LIB_NAME_IMP = libcurl.lib BASE_NAME_STATIC = $(BASE_NAME)_a
LIB_NAME_DLL_DEBUG = libcurl_debug.dll BASE_NAME_STATIC_DEBUG = $(BASE_NAME_STATIC)_debug
LIB_NAME_IMP_DEBUG = libcurl_debug.lib
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 # CURL Command section
PROGRAM_NAME = curl.exe PROGRAM_NAME = curl.exe
@@ -262,25 +273,29 @@ CURL_CC = $(CURL_CC) $(CURL_CFLAGS)
!IF "$(AS_DLL)" == "true" !IF "$(AS_DLL)" == "true"
LNK = $(LNKDLL) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET) LNK = $(LNKDLL) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)
!IF "$(DEBUG)"=="yes" !IF "$(DEBUG)"=="yes"
TARGET = $(LIB_NAME_DLL_DEBUG) TARGET = $(LIB_NAME_DLL_DEBUG)
LNK = $(LNK) /DEBUG /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_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) CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP_DEBUG)
!ELSE !ELSE
TARGET = $(LIB_NAME_DLL) TARGET = $(LIB_NAME_DLL)
LNK = $(LNK) /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP) LNK = $(LNK) /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)
PDB = $(PDB_NAME_DLL)
CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP) CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)
!ENDIF !ENDIF
RESOURCE = $(LIB_DIROBJ)\libcurl.res RESOURCE = $(LIB_DIROBJ)\libcurl.res
# AS_DLL # AS_DLL
!ELSE !ELSE
!IF "$(DEBUG)"=="yes" !IF "$(DEBUG)"=="yes"
TARGET = $(LIB_NAME_STATIC_DEBUG) TARGET = $(LIB_NAME_STATIC_DEBUG)
PDB = $(PDB_NAME_STATIC_DEBUG)
!ELSE !ELSE
TARGET = $(LIB_NAME_STATIC) TARGET = $(LIB_NAME_STATIC)
PDB = $(PDB_NAME_STATIC)
!ENDIF !ENDIF
LNK = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET) LNK = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)
CC = $(CC) $(CFLAGS_LIBCURL_STATIC) CC = $(CC) $(CFLAGS_LIBCURL_STATIC)
@@ -320,7 +335,7 @@ CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)
!ENDIF !ENDIF
!IF "$(GEN_PDB)"=="true" !IF "$(GEN_PDB)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_PDB) CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
LFLAGS = $(LFLAGS) $(LFLAGS_PDB) LFLAGS = $(LFLAGS) $(LFLAGS_PDB)
!ENDIF !ENDIF