diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-01-02 19:19:32 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-01-02 19:19:32 +0000 |
| commit | 1576f3319ef03d801f8783fb017b3c2da6c8a099 (patch) | |
| tree | 076b6b75ef85c3af5f99d4e7402a538b7fc44846 | |
| parent | 8ac90316d9aa1541c7e042f6807590f7a4690fb6 (diff) | |
Alex Neblett's minor update
| -rw-r--r-- | lib/Makefile.vc6 | 6 | ||||
| -rw-r--r-- | src/Makefile.vc6 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 9b21f5c5a..0be22560b 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -31,11 +31,11 @@ LIB_NAME_DEBUG = libcurld #
# Stem for DLL import libs
#
-IMPLIB_NAME = libcurl_imp
-IMPLIB_NAME_DEBUG = libcurld_imp
+IMPLIB_NAME = libcurl
+IMPLIB_NAME_DEBUG = libcurld
!IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.7d
+OPENSSL_PATH = ../../openssl-0.9.7e
!ENDIF
!IFNDEF ZLIB_PATH
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 373fdbef1..5cbf1eab4 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -20,7 +20,7 @@ ZLIB_PATH = ../../zlib-1.2.1 !ENDIF
!IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.7d
+OPENSSL_PATH = ../../openssl-0.9.7e
!ENDIF
########################################################
@@ -30,17 +30,17 @@ LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)" ZLIBLIBS = zlib.lib
SSLINC = /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
CFLAGSSSL = /DUSE_SSLEAY
-LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"
+LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32dll"
SSLLIBS = libeay32.lib ssleay32.lib gdi32.lib
## Release
CCR = cl.exe /MD /O2 /DNDEBUG
-LINKR = link.exe /incremental:no /libpath:../lib
+LINKR = link.exe /incremental:no /libpath:"../lib"
RCR = rc.exe /dCURLDEBUG=0
## Debug
CCD = cl.exe /MDd /Gm /ZI /Od /D_DEBUG /GZ
-LINKD = link.exe /incremental:yes /debug /libpath:../lib
+LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
RCD = rc.exe /dCURLDEBUG=1
CFLAGS = /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c
|