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

Gisle Vanem's libcurl.dll version info patch applied

Browse Source
This commit is contained in:
Daniel Stenberg
2003-11-06 15:09:30 +00:00
parent d95f7129d5
commit ecb818805b
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@@ -9,7 +9,7 @@ EXTRA_DIST = getdate.y Makefile.b32 Makefile.b32.resp Makefile.m32 \
curllib.dsw config-vms.h config-win32.h config-riscos.h config-mac.h \ curllib.dsw config-vms.h config-win32.h config-riscos.h config-mac.h \
config.h.in ca-bundle.crt README.encoding README.memoryleak \ config.h.in ca-bundle.crt README.encoding README.memoryleak \
README.ares makefile.dj config.dj \ README.ares makefile.dj config.dj \
libcurl.framework.make libcurl.plist libcurl.framework.make libcurl.plist libcurl.rc
lib_LTLIBRARIES = libcurl.la lib_LTLIBRARIES = libcurl.la

12
lib/Makefile.m32
View File

@@ -70,13 +70,13 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
$(RANLIB) libcurl.a $(RANLIB) libcurl.a
$(STRIP) $@ $(STRIP) $@
DLLINITOBJ = RESOURCE = libcurl.res
# remove the last line above to keep debug info # remove the last line above to keep debug info
libcurl.dll libcurldll.a: libcurl.a libcurl.def $(DLLINITOBJ) libcurl.dll libcurldll.a: libcurl.a libcurl.def $(RESOURCE)
$(RM) $@ $(RM) $@
dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) $(DLLINITOBJ) $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) $(RESOURCE) $(DLL_LIBS) -lwsock32 -lws2_32 -lwinmm
$(STRIP) $@ $(STRIP) $@
# remove the last line above to keep debug info # remove the last line above to keep debug info
@@ -90,10 +90,12 @@ libcurl.dll libcurldll.a: libcurl.a libcurl.def $(DLLINITOBJ)
.S.o: .S.o:
$(COMPILE) -c $< $(COMPILE) -c $<
libcurl.res: libcurl.rc
windres -DCURLDEBUG=0 -O COFF -o $@ -i $^
clean: clean:
$(RM) $(libcurl_a_OBJECTS) $(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
distrib: clean distrib: clean
$(RM) $(libcurl_a_LIBRARIES) $(RM) $(libcurl_a_LIBRARIES)

25
lib/Makefile.vc6
View File

@@ -62,6 +62,7 @@ DIROBJ =.\$(CFG)
LNK = $(LNKLIB) /out:$(TARGET) LNK = $(LNKLIB) /out:$(TARGET)
CC = $(CCNODBG) CC = $(CCNODBG)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -73,6 +74,7 @@ DIROBJ =.\$(CFG)
LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
CC = $(CCNODBG) CC = $(CCNODBG)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -86,6 +88,7 @@ LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
LINKLIBS = $(LINKLIBS) LINKLIBS = $(LINKLIBS)
CC = $(CCNODBG) $(CFLAGSSSL) CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -99,6 +102,7 @@ LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCNODBG) $(CFLAGSSSL) CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -111,6 +115,7 @@ LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCNODBG) $(CFLAGSSSL) CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
@@ -123,6 +128,7 @@ DIROBJ =.\$(CFG)
LNK = $(LNKLIB) /out:$(TARGET) LNK = $(LNKLIB) /out:$(TARGET)
CC = $(CCDEBUG) CC = $(CCDEBUG)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -134,6 +140,7 @@ DIROBJ =.\$(CFG)
LNK = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb" LNK = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
CC = $(CCDEBUG) CC = $(CCDEBUG)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -146,6 +153,7 @@ LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
LINKLIBS = $(LINKLIBS) LINKLIBS = $(LINKLIBS)
CC = $(CCDEBUG) $(CFLAGSSSL) CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
###################### ######################
@@ -159,6 +167,7 @@ LNK = $(LNKDLL) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBU
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS) $(SSLLIBS)
CC = $(CCDEBUG) $(CFLAGSSSL) CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF !ENDIF
####################### #######################
@@ -221,7 +230,8 @@ X_OBJS= \
$(DIROBJ)\http_digest.obj \ $(DIROBJ)\http_digest.obj \
$(DIROBJ)\http_negotiate.obj \ $(DIROBJ)\http_negotiate.obj \
$(DIROBJ)\http_ntlm.obj \ $(DIROBJ)\http_ntlm.obj \
$(DIROBJ)\md5.obj $(DIROBJ)\md5.obj \
$(RESOURCE)
all : $(TARGET) all : $(TARGET)
@@ -234,12 +244,23 @@ $(X_OBJS): $(DIROBJ)
$(DIROBJ): $(DIROBJ):
@if not exist "$(DIROBJ)" mkdir $(DIROBJ) @if not exist "$(DIROBJ)" mkdir $(DIROBJ)
.SUFFIXES: .c .obj .SUFFIXES: .c .obj .res
{.\}.c{$(DIROBJ)\}.obj: {.\}.c{$(DIROBJ)\}.obj:
$(CC) $(CFLAGS) /Fo"$@" $< $(CC) $(CFLAGS) /Fo"$@" $<
debug-dll\libcurl.res \
debug-ssl-dll\libcurl.res \
release-libcurl-ssl-dll\libcurl.res: libcurl.rc
rc /dCURL_DEBUG=1 /Fo $@ libcurl.rc
release-dll\libcurl.res \
release-ssl-dll\libcurl.res \
release-libcurl-ssl-dll\libcurl.res: libcurl.rc
rc /dCURL_DEBUG=0 /Fo $@ libcurl.rc
clean: clean:
-@erase $(DIROBJ)\*.obj -@erase $(DIROBJ)\*.obj
-@erase $(DIROBJ)\*.res
-@erase vc60.idb -@erase vc60.idb
-@erase vc60.pch -@erase vc60.pch