mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 15:48:49 -05:00
Renamed import lib to "libcurl_imp.lib".
Some cleanup and making it more readable.
This commit is contained in:
parent
6f8e3f106a
commit
61599ceb7b
@ -22,8 +22,18 @@
|
|||||||
# $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $
|
# $Id: Makefile.vc6,v 1.17 2004/01/13 08:57:01 bagder Exp $
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
|
#
|
||||||
|
# Stem for static libs and DLLs
|
||||||
|
#
|
||||||
LIB_NAME = libcurl
|
LIB_NAME = libcurl
|
||||||
LIB_NAME_DEBUG = libcurld
|
LIB_NAME_DEBUG = libcurld
|
||||||
|
|
||||||
|
#
|
||||||
|
# Stem for DLL import libs
|
||||||
|
#
|
||||||
|
IMPLIB_NAME = libcurl_imp
|
||||||
|
IMPLIB_NAME_DEBUG = libcurld_imp
|
||||||
|
|
||||||
!IFNDEF OPENSSL_PATH
|
!IFNDEF OPENSSL_PATH
|
||||||
OPENSSL_PATH = ../../openssl-0.9.7d
|
OPENSSL_PATH = ../../openssl-0.9.7d
|
||||||
!ENDIF
|
!ENDIF
|
||||||
@ -43,7 +53,7 @@ CCNODBG = cl.exe /MD /O2 /DNDEBUG
|
|||||||
CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D_DEBUG /GZ
|
CCDEBUG = cl.exe /MDd /Od /Gm /Zi /D_DEBUG /GZ
|
||||||
CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
|
CFLAGSSSL = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
|
||||||
CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
|
CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
|
||||||
CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /DVC6 /D_MBCS /D_LIB /YX /FD /c /DBUILDING_LIBCURL
|
CFLAGS = /I. /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL
|
||||||
LNKDLL = link.exe /DLL
|
LNKDLL = link.exe /DLL
|
||||||
LNKLIB = link.exe /lib
|
LNKLIB = link.exe /lib
|
||||||
LFLAGS = /nologo
|
LFLAGS = /nologo
|
||||||
@ -61,8 +71,8 @@ CFGSET = FALSE
|
|||||||
# release
|
# release
|
||||||
|
|
||||||
!IF "$(CFG)" == "release"
|
!IF "$(CFG)" == "release"
|
||||||
TARGET =$(LIB_NAME).lib
|
TARGET = $(LIB_NAME).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LNK = $(LNKLIB) /out:$(TARGET)
|
LNK = $(LNKLIB) /out:$(TARGET)
|
||||||
CC = $(CCNODBG)
|
CC = $(CCNODBG)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
@ -72,8 +82,8 @@ CFGSET = TRUE
|
|||||||
# release-zlib
|
# release-zlib
|
||||||
|
|
||||||
!IF "$(CFG)" == "release-zlib"
|
!IF "$(CFG)" == "release-zlib"
|
||||||
TARGET =$(LIB_NAME).lib
|
TARGET = $(LIB_NAME).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
||||||
LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
|
LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
|
||||||
CC = $(CCNODBG) $(CFLAGSZLIB)
|
CC = $(CCNODBG) $(CFLAGSZLIB)
|
||||||
@ -84,9 +94,9 @@ CFGSET = TRUE
|
|||||||
# release-dll
|
# release-dll
|
||||||
|
|
||||||
!IF "$(CFG)" == "release-dll"
|
!IF "$(CFG)" == "release-dll"
|
||||||
TARGET =$(LIB_NAME).dll
|
TARGET = $(LIB_NAME).dll
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LNK = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
|
LNK = $(LNKDLL) $(WINLIBS) /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME).lib
|
||||||
CC = $(CCNODBG)
|
CC = $(CCNODBG)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
RESOURCE = $(DIROBJ)\libcurl.res
|
RESOURCE = $(DIROBJ)\libcurl.res
|
||||||
@ -96,8 +106,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
|
|||||||
# release-ssl
|
# release-ssl
|
||||||
|
|
||||||
!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"
|
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
|
||||||
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
|
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
|
||||||
CC = $(CCNODBG) $(CFLAGSSSL)
|
CC = $(CCNODBG) $(CFLAGSSSL)
|
||||||
@ -108,10 +118,10 @@ CFGSET = TRUE
|
|||||||
# release-ssl-dll
|
# release-ssl-dll
|
||||||
|
|
||||||
!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"
|
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
|
||||||
LNK = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
|
LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME).lib
|
||||||
CC = $(CCNODBG) $(CFLAGSSSL)
|
CC = $(CCNODBG) $(CFLAGSSSL)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
RESOURCE = $(DIROBJ)\libcurl.res
|
RESOURCE = $(DIROBJ)\libcurl.res
|
||||||
@ -120,8 +130,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
|
|||||||
######################
|
######################
|
||||||
# release-ssl-zlib
|
# release-ssl-zlib
|
||||||
!IF "$(CFG)" == "release-ssl-zlib"
|
!IF "$(CFG)" == "release-ssl-zlib"
|
||||||
TARGET =$(LIB_NAME).lib
|
TARGET = $(LIB_NAME).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
|
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
|
||||||
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
||||||
LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(TARGET)
|
LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(TARGET)
|
||||||
@ -132,8 +142,8 @@ CFGSET = TRUE
|
|||||||
######################
|
######################
|
||||||
# release-libcurl-ssl-dll
|
# release-libcurl-ssl-dll
|
||||||
!IF "$(CFG)" == "release-libcurl-ssl-dll"
|
!IF "$(CFG)" == "release-libcurl-ssl-dll"
|
||||||
TARGET =$(LIB_NAME).lib
|
TARGET = $(LIB_NAME).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
|
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
|
||||||
LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)
|
LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)
|
||||||
CC = $(CCNODBG) $(CFLAGSSSL)
|
CC = $(CCNODBG) $(CFLAGSSSL)
|
||||||
@ -146,8 +156,8 @@ RESOURCE = $(DIROBJ)\libcurl.res
|
|||||||
# debug
|
# debug
|
||||||
|
|
||||||
!IF "$(CFG)" == "debug"
|
!IF "$(CFG)" == "debug"
|
||||||
TARGET =$(LIB_NAME_DEBUG).lib
|
TARGET = $(LIB_NAME_DEBUG).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LNK = $(LNKLIB) /out:$(TARGET)
|
LNK = $(LNKLIB) /out:$(TARGET)
|
||||||
CC = $(CCDEBUG)
|
CC = $(CCDEBUG)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
@ -157,9 +167,9 @@ CFGSET = TRUE
|
|||||||
# debug-dll
|
# debug-dll
|
||||||
|
|
||||||
!IF "$(CFG)" == "debug-dll"
|
!IF "$(CFG)" == "debug-dll"
|
||||||
TARGET =$(LIB_NAME_DEBUG).dll
|
TARGET = $(LIB_NAME_DEBUG).dll
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
|
LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME_DEBUG).lib /PDB:$(IMPLIB_NAME_DEBUG).pdb
|
||||||
CC = $(CCDEBUG)
|
CC = $(CCDEBUG)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
RESOURCE = $(DIROBJ)\libcurl.res
|
RESOURCE = $(DIROBJ)\libcurl.res
|
||||||
@ -170,7 +180,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
|
|||||||
#todo
|
#todo
|
||||||
!IF "$(CFG)" == "debug-ssl"
|
!IF "$(CFG)" == "debug-ssl"
|
||||||
TARGET = $(LIB_NAME_DEBUG).lib
|
TARGET = $(LIB_NAME_DEBUG).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
|
LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
|
||||||
CC = $(CCDEBUG) $(CFLAGSSSL)
|
CC = $(CCDEBUG) $(CFLAGSSSL)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
@ -180,7 +190,7 @@ CFGSET = TRUE
|
|||||||
# debug-zlib
|
# debug-zlib
|
||||||
!IF "$(CFG)" == "debug-zlib"
|
!IF "$(CFG)" == "debug-zlib"
|
||||||
TARGET = $(LIB_NAME_DEBUG).lib
|
TARGET = $(LIB_NAME_DEBUG).lib
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
|
||||||
LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
|
LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
|
||||||
CC = $(CCDEBUG) $(CFLAGSZLIB)
|
CC = $(CCDEBUG) $(CFLAGSZLIB)
|
||||||
@ -191,10 +201,10 @@ CFGSET = TRUE
|
|||||||
# debug-ssl-dll
|
# debug-ssl-dll
|
||||||
|
|
||||||
!IF "$(CFG)" == "debug-ssl-dll"
|
!IF "$(CFG)" == "debug-ssl-dll"
|
||||||
TARGET =$(LIB_NAME_DEBUG).dll
|
TARGET = $(LIB_NAME_DEBUG).dll
|
||||||
DIROBJ =.\$(CFG)
|
DIROBJ = .\$(CFG)
|
||||||
LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
|
LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
|
||||||
LNK = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
|
LNK = $(LNKDLL) $(WINLIBS) $(LFLAGSSSL) /DEBUG /out:$(TARGET) /IMPLIB:$(IMPLIB_NAME_DEBUG).lib /PDB:$(IMPLIB_NAME_DEBUG).pdb
|
||||||
CC = $(CCDEBUG) $(CFLAGSSSL)
|
CC = $(CCDEBUG) $(CFLAGSSSL)
|
||||||
CFGSET = TRUE
|
CFGSET = TRUE
|
||||||
RESOURCE = $(DIROBJ)\libcurl.res
|
RESOURCE = $(DIROBJ)\libcurl.res
|
||||||
@ -308,3 +318,4 @@ clean:
|
|||||||
-@erase $(DIROBJ)\*.res
|
-@erase $(DIROBJ)\*.res
|
||||||
-@erase vc60.idb
|
-@erase vc60.idb
|
||||||
-@erase vc60.pch
|
-@erase vc60.pch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user