diff -cr curl-7.9.6-pre2\docs\INSTALL curl-7.9.6-pre2-new\docs\INSTALL *** curl-7.9.6-pre2\docs\INSTALL Wed Mar 06 13:33:08 2002 --- curl-7.9.6-pre2-new\docs\INSTALL Thu Mar 21 15:59:15 2002 *************** *** 202,216 **** Microsoft command line style ---------------------------- Please read the OpenSSL documentation on how to compile and install ! the OpenSSL library. This generates the libeay32.dll and ssleay32.dll ! files in the out32dll subdirectory in the OpenSSL home directory. If ! you compiled OpenSSL static libraries (libeay32.lib, ssleay32.lib, ! RSAglue.lib) they are created in the out32 subdirectory. ! Run the 'vcvars32.bat' file to get the proper environment variables ! set. The vcvars32.bat file is part of the Microsoft development environment and you may find it in 'C:\Program Files\Microsoft Visual ! Studio\vc98\bin' if you installed Visual C/C++ 6 in the default directory. Before running nmake define the OPENSSL_PATH environment variable with --- 202,217 ---- Microsoft command line style ---------------------------- Please read the OpenSSL documentation on how to compile and install ! the OpenSSL library. The build process of OpenSSL generates the ! libeay32.dll and ssleay32.dll ! files in the out32dll subdirectory in the OpenSSL home directory. ! OpenSSL static libraries (libeay32.lib, ssleay32.lib, ! RSAglue.lib) are created in the out32 subdirectory. ! Run the 'vcvars32.bat' file to get a proper environment. ! The vcvars32.bat file is part of the Microsoft VisualC/C++ development environment and you may find it in 'C:\Program Files\Microsoft Visual ! Studio\vc98\bin' provided that you had installed Visual C/C++ 6 in the default directory. Before running nmake define the OPENSSL_PATH environment variable with *************** *** 218,234 **** set OPENSSL_PATH=c:\openssl-0.9.6b ! Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in the curl's root directory. 'nmake vc-ssl' will create a libcurl static and dynamic libraries in the lib subdirectory, as well as a statically linked ! version of curl.exe in the scr subdirectory. This statically linked ! version is a standalone executable not requiring any DLL at ! runtime. This making method requires that you have build the static libraries of OpenSSL available in OpenSSL's out32 subdirectory. 'nmake vc-ssl-dll' creates the libcurl dynamic library and links curl.exe against libcurl and OpenSSL dynamically. ! This executables requires libcurl.dll and the OpenSSL DLLs ! at runtime. Microsoft / Borland style ------------------------- --- 219,235 ---- set OPENSSL_PATH=c:\openssl-0.9.6b ! Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root directory. 'nmake vc-ssl' will create a libcurl static and dynamic libraries in the lib subdirectory, as well as a statically linked ! version of curl.exe in the src subdirectory. This statically linked ! version of curl.exe is a standalone executable, which does not require ! any DLL to run. This build method requires that you have build the static libraries of OpenSSL available in OpenSSL's out32 subdirectory. 'nmake vc-ssl-dll' creates the libcurl dynamic library and links curl.exe against libcurl and OpenSSL dynamically. ! This dynamically linked curl executable requires libcurl.dll and the OpenSSL DLLs ! (libeay32.dll, ssleay32.dll) at runtime. Microsoft / Borland style ------------------------- Only in curl-7.9.6-pre2-new\lib: libcurl.lib diff -cr curl-7.9.6-pre2\lib\Makefile.vc6 curl-7.9.6-pre2-new\lib\Makefile.vc6 *** curl-7.9.6-pre2\lib\Makefile.vc6 Fri Mar 15 15:46:38 2002 --- curl-7.9.6-pre2-new\lib\Makefile.vc6 Thu Mar 21 15:00:19 2002 *************** *** 47,53 **** LNKDLL = link.exe /DLL /def:libcurl.def LNKLIB = link.exe -lib LFLAGS = /nologo - LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll LINKLIBS = ws2_32.lib SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib CFGSET = FALSE --- 47,52 ---- *************** *** 80,87 **** !IF "$(CFG)" == "release-ssl" TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) ! LINKLIBS = $(LINKLIBS) $(SSLLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF --- 79,87 ---- !IF "$(CFG)" == "release-ssl" TARGET =$(LIB_NAME).lib DIROBJ =.\$(CFG) + LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32" LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) ! LINKLIBS = $(LINKLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF *************** *** 92,106 **** !IF "$(CFG)" == "release-ssl-dll" TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG) LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" LINKLIBS = $(LINKLIBS) $(SSLLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF - - - ###################### # debug --- 92,104 ---- !IF "$(CFG)" == "release-ssl-dll" TARGET =$(LIB_NAME).dll DIROBJ =.\$(CFG) + LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll" LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" LINKLIBS = $(LINKLIBS) $(SSLLIBS) CC = $(CCNODBG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF ###################### # debug *************** *** 130,136 **** TARGET = $(LIB_NAME_DEBUG).lib DIROBJ =.\$(CFG) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) ! LINKLIBS = $(LINKLIBS) $(SSLLIBS) CC = $(CCDEBUG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF --- 128,134 ---- TARGET = $(LIB_NAME_DEBUG).lib DIROBJ =.\$(CFG) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) ! LINKLIBS = $(LINKLIBS) CC = $(CCDEBUG) $(CFLAGSSSL) CFGSET = TRUE !ENDIF Only in curl-7.9.6-pre2-new\lib: release-ssl Only in curl-7.9.6-pre2-new\lib: vc60.idb Only in curl-7.9.6-pre2-new\lib: vc60.pch Only in curl-7.9.6-pre2-new\src: curl.exe Only in curl-7.9.6-pre2-new\src: hugehelp.obj Only in curl-7.9.6-pre2-new\src: main.obj diff -cr curl-7.9.6-pre2\src\Makefile.vc6 curl-7.9.6-pre2-new\src\Makefile.vc6 *** curl-7.9.6-pre2\src\Makefile.vc6 Wed Feb 06 17:03:12 2002 --- curl-7.9.6-pre2-new\src\Makefile.vc6 Thu Mar 21 15:00:20 2002 *************** *** 45,50 **** --- 45,64 ---- urlglob.obj \ main.obj + + ###################### + # release-ssl + + !IF "$(CFG)" == "release-ssl" + !IFNDEF OPENSSL_PATH + OPENSSL_PATH = ../../openssl-0.9.6 + !ENDIF + LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32" + SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib gdi32.lib + LINKLIBS = $(LINKLIBS) $(SSLLIBS) + LFLAGS = $(LFLAGS) $(LFLAGSSSL) + !ENDIF + all : release release: $(RELEASE_OBJS) Only in curl-7.9.6-pre2-new\src: urlglob.obj Only in curl-7.9.6-pre2-new\src: vc60.idb Only in curl-7.9.6-pre2-new\src: vc60.pch Only in curl-7.9.6-pre2-new\src: writeout.obj