> I've made it so in CVS now, can you make an updated patch that take advantage
> of this info?

Here is a revised patch.

------------------ lib\libcurl.rc (new file) -----------------------

#include <winver.h>
#include "../include/curl/curl.h"

LANGUAGE 0x09,0x01

#define RC_VERSION LIBCURL_VERSION_MAJOR, LIBCURL_VERSION_MINOR, LIBCURL_VERSION_PATCH, 0

VS_VERSION_INFO VERSIONINFO
  FILEVERSION RC_VERSION
  PRODUCTVERSION RC_VERSION
  FILEFLAGSMASK 0x3fL
#if CURLDEBUG
  FILEFLAGS 1
#else
  FILEFLAGS 0
#endif
  FILEOS VOS__WINDOWS32
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L

BEGIN
  BLOCK "StringFileInfo"
  BEGIN
    BLOCK "040904b0"
    BEGIN
      VALUE "CompanyName", "The cURL library, http://curl.haxx.se/\0"
      VALUE "FileDescription", "libcurl Shared Library\0"
      VALUE "FileVersion", LIBCURL_VERSION "\0"
      VALUE "InternalName", "libcurl\0"
      VALUE "OriginalFilename", "libcurl.dll\0"
      VALUE "ProductName", "The cURL library\0"
      VALUE "ProductVersion", LIBCURL_VERSION "\0"
      VALUE "LegalCopyright", "Copyright « ... fill this in\0"
    END
  END

  BLOCK "VarFileInfo"
  BEGIN
    VALUE "Translation", 0x409, 1200
  END
END

----------------------------------------
--- CVS-latest\lib\Makefile.m32 Tue Oct 21 15:14:25 2003
+++ lib\Makefile.m32 Thu Nov 06 15:22:37 2003
@@ -70,13 +70,13 @@
        $(RANLIB) libcurl.a
        $(STRIP) $@

-DLLINITOBJ =
+RESOURCE = libcurl.res

 # 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) $@
- 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) $@

 # remove the last line above to keep debug info
@@ -90,10 +90,12 @@
 .S.o:
        $(COMPILE) -c $<

+libcurl.res: libcurl.rc
+ windres -DCURLDEBUG=0 -O COFF -o $@ -i $^
+
 clean:
- $(RM) $(libcurl_a_OBJECTS)
+ $(RM) $(libcurl_a_OBJECTS) $(RESOURCE)

 distrib: clean
-
        $(RM) $(libcurl_a_LIBRARIES)

----------------------------------------

--- CVS-latest\lib\Makefile.vc6 Tue Nov 04 07:59:26 2003
+++ lib\Makefile.vc6 Thu Nov 06 15:22:22 2003
@@ -73,6 +73,7 @@
 LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
 CC = $(CCNODBG)
 CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
 !ENDIF

 ######################
@@ -99,6 +100,7 @@
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC = $(CCNODBG) $(CFLAGSSSL)
 CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
 !ENDIF

 ######################
@@ -111,6 +113,7 @@
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC = $(CCNODBG) $(CFLAGSSSL)
 CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
 !ENDIF

@@ -134,6 +137,7 @@
 LNK = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
 CC = $(CCDEBUG)
 CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
 !ENDIF

 ######################
@@ -159,6 +163,7 @@
 LINKLIBS = $(LINKLIBS) $(SSLLIBS)
 CC = $(CCDEBUG) $(CFLAGSSSL)
 CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
 !ENDIF

 #######################
@@ -221,7 +226,8 @@
  $(DIROBJ)\http_digest.obj \
         $(DIROBJ)\http_negotiate.obj \
         $(DIROBJ)\http_ntlm.obj \
- $(DIROBJ)\md5.obj
+ $(DIROBJ)\md5.obj \
+ $(RESOURCE)

 all : $(TARGET)

@@ -234,12 +240,23 @@
 $(DIROBJ):
  @if not exist "$(DIROBJ)" mkdir $(DIROBJ)

-.SUFFIXES: .c .obj
+.SUFFIXES: .c .obj .res

 {.\}.c{$(DIROBJ)\}.obj:
  $(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:
  -_at_erase $(DIROBJ)\*.obj
+ -_at_erase $(DIROBJ)\*.res
  -_at_erase vc60.idb
  -_at_erase vc60.pch

----------------------------------------

Hope the long lines doesn't wrap. Or I'll make an attachment.

--gv

-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
Received on 2003-11-06