moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 07:38:49 -05:00
Code Issues Releases Wiki Activity

Miklos Nemeth's update

Browse Source
This commit is contained in:
Daniel Stenberg 2002-03-23 15:41:17 +00:00
parent 6f3e0051c3
commit 5af61716aa
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Makefile.vc6
View File

@ -47,7 +47,6 @@ CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB
LNKDLL = link.exe /DLL /def:libcurl.def LNKDLL = link.exe /DLL /def:libcurl.def
LNKLIB = link.exe -lib LNKLIB = link.exe -lib
LFLAGS = /nologo LFLAGS = /nologo
LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
LINKLIBS = ws2_32.lib LINKLIBS = ws2_32.lib
SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib SSLLIBS = libeay32.lib ssleay32.lib RSAglue.lib
CFGSET = FALSE CFGSET = FALSE
@ -80,8 +79,9 @@ CFGSET = TRUE
!IF "$(CFG)" == "release-ssl" !IF "$(CFG)" == "release-ssl"
TARGET =$(LIB_NAME).lib TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG) DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS)
CC = $(CCNODBG) $(CFLAGSSSL) CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
!ENDIF !ENDIF
@ -92,15 +92,13 @@ CFGSET = TRUE
!IF "$(CFG)" == "release-ssl-dll" !IF "$(CFG)" == "release-ssl-dll"
TARGET =$(LIB_NAME).dll TARGET =$(LIB_NAME).dll
DIROBJ =.\$(CFG) DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
LNK = $(LNKDLL) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib" 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
!ENDIF !ENDIF
###################### ######################
# debug # debug
@ -130,7 +128,7 @@ CFGSET = TRUE
TARGET = $(LIB_NAME_DEBUG).lib TARGET = $(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG) DIROBJ =.\$(CFG)
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET) LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
LINKLIBS = $(LINKLIBS) $(SSLLIBS) LINKLIBS = $(LINKLIBS)
CC = $(CCDEBUG) $(CFLAGSSSL) CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE CFGSET = TRUE
!ENDIF !ENDIF

14
src/Makefile.vc6
View File

@ -45,6 +45,20 @@ LINK_OBJS= \
urlglob.obj \ urlglob.obj \
main.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 all : release
release: $(RELEASE_OBJS) release: $(RELEASE_OBJS)