curl-library
Proposed VC6 Makefiles patches 2/3 (.\lib\Makefile.vc6)
Date: Wed, 6 Oct 2004 20:41:53 +0200
--- Makefile.vc6 2004-07-14 16:17:52.000000000 +0200
+++ Makefile.vc6.new 2004-10-06 18:39:38.000000000 +0200
@@ -48,6 +48,8 @@
LNKLIB = link.exe /lib
LFLAGS = /nologo
SSLLIBS = libeay32.lib ssleay32.lib
+ZLIBLIBSDLL= zdll.lib
+ZLIBLIBS = zlib.lib
!IFDEF USEMM_LIBS
WINLIBS = wsock32.lib winmm.lib
!ELSE
@@ -63,44 +65,45 @@
!IF "$(CFG)" == "release"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
-LNK = $(LNKLIB) /out:$(TARGET)
+LNK = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)
CC = $(CCNODBG)
CFGSET = TRUE
!ENDIF
######################
-# release-zlib
+# release-ssl
-!IF "$(CFG)" == "release-zlib"
+!IF "$(CFG)" == "release-ssl"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
-LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
-CC = $(CCNODBG) $(CFLAGSZLIB)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
+LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
!ENDIF
######################
-# release-dll
+# release-zlib
-!IF "$(CFG)" == "release-dll"
-TARGET =$(LIB_NAME).dll
-DIROBJ =.\$(CFG)
-LNK = $(LNKDLL) /out:$(TARGET) /IMPLIB:"$(LIB_NAME).lib"
-CC = $(CCNODBG)
-CFGSET = TRUE
-RESOURCE = $(DIROBJ)\libcurl.res
+!IF "$(CFG)" == "release-zlib"
+TARGET =$(LIB_NAME).lib
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(CFLAGSZLIB)
+CFGSET = TRUE
!ENDIF
######################
-# release-ssl
+# release-ssl-zlib
-!IF "$(CFG)" == "release-ssl"
+!IF "$(CFG)" == "release-ssl-zlib"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
-LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
-CC = $(CCNODBG) $(CFLAGSSSL)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)
CFGSET = TRUE
!ENDIF
@@ -108,95 +111,225 @@
# release-ssl-dll
!IF "$(CFG)" == "release-ssl-dll"
-TARGET =$(LIB_NAME).dll
+TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
-LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /out:$(TARGET)
/IMPLIB:"$(LIB_NAME).lib"
+LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
-RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
######################
-# release-ssl-zlib
-!IF "$(CFG)" == "release-ssl-zlib"
+# release-zlib-dll
+
+!IF "$(CFG)" == "release-zlib-dll"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
-LNK = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSZLIB) /out:$(TARGET)
-CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)
+LNK = $(LNKLIB) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(CFLAGSZLIB)
CFGSET = TRUE
!ENDIF
######################
-# release-libcurl-ssl-dll
-!IF "$(CFG)" == "release-libcurl-ssl-dll"
+# release-ssl-dll-zlib-dll
+
+!IF "$(CFG)" == "release-ssl-dll-zlib-dll"
TARGET =$(LIB_NAME).lib
DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET)
+CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# release-dll
+
+!IF "$(CFG)" == "release-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LNK = $(LNKDLL) $(WINLIBS) /out:$(DIROBJ)\$(TARGET)
/IMPLIB:"$(DIROBJ)\$(LIB_NAME).lib"
+CC = $(CCNODBG)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# release-dll-ssl-dll
+
+!IF "$(CFG)" == "release-dll-ssl-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
-LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(TARGET)
+LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL)
/out:$(DIROBJ)\$(TARGET) /IMPLIB:"$(DIROBJ)\$(LIB_NAME).lib"
CC = $(CCNODBG) $(CFLAGSSSL)
CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
+######################
+# release-dll-zlib-dll
+
+!IF "$(CFG)" == "release-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKDLL) $(ZLIBLIBSDLL) $(WINLIBS) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET) /IMPLIB:"$(DIROBJ)\$(LIB_NAME).lib"
+CC = $(CCNODBG) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
######################
-# debug
+# release-dll-ssl-dll-zlib-dll
-!IF "$(CFG)" == "debug"
-TARGET =$(LIB_NAME_DEBUG).lib
-DIROBJ =.\$(CFG)
-LNK = $(LNKLIB) /out:$(TARGET)
-CC = $(CCDEBUG)
-CFGSET = TRUE
+!IF "$(CFG)" == "release-dll-ssl-dll-zlib-dll"
+TARGET =$(LIB_NAME).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(ZLIBLIBSDLL) $(WINLIBS) $(LFLAGSSSL)
$(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET) /IMPLIB:"$(DIROBJ)\$(LIB_NAME).lib"
+CC = $(CCNODBG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
######################
-# debug-dll
+# debug
-!IF "$(CFG)" == "debug-dll"
-TARGET =$(LIB_NAME_DEBUG).dll
+!IF "$(CFG)" == "debug"
+TARGET =$(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG)
-LNK = $(LNKDLL) /DEBUG /out:$(TARGET) /IMPLIB:"$(LIB_NAME_DEBUG).lib"
/PDB:"$(LIB_NAME_DEBUG).pdb"
+LNK = $(LNKLIB) /out:$(DIROBJ)\$(TARGET)
CC = $(CCDEBUG)
CFGSET = TRUE
-RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
######################
# debug-ssl
-#todo
+
!IF "$(CFG)" == "debug-ssl"
TARGET = $(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG)
-LNK = $(LNKLIB) $(LFLAGSSSL) /out:$(TARGET)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
+LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)
CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE
!ENDIF
######################
# debug-zlib
+
!IF "$(CFG)" == "debug-zlib"
TARGET = $(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG)
LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
-LNK = $(LNKLIB) $(LFLAGSZLIB) /out:$(TARGET)
+LNK = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
CC = $(CCDEBUG) $(CFLAGSZLIB)
CFGSET = TRUE
!ENDIF
######################
+# debug-ssl-zlib
+
+!IF "$(CFG)" == "debug-ssl-zlib"
+TARGET =$(LIB_NAME_DEBUG).lib
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32"
+LNK = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET)
+CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+!ENDIF
+
+######################
# debug-ssl-dll
!IF "$(CFG)" == "debug-ssl-dll"
-TARGET =$(LIB_NAME_DEBUG).dll
+TARGET =$(LIB_NAME_DEBUG).lib
DIROBJ =.\$(CFG)
LFLAGSSSL = /LIBPATH:$(OPENSSL_PATH)/out32dll
-LNK = $(LNKDLL) $(LFLAGSSSL) /DEBUG /out:$(TARGET)
/IMPLIB:"$(LIB_NAME_DEBUG).lib" /PDB:"$(LIB_NAME_DEBUG).pdb"
+LNK = $(LNKLIB) $(SSLLIBS) $(LFLAGSSSL) /out:$(DIROBJ)\$(TARGET)
CC = $(CCDEBUG) $(CFLAGSSSL)
CFGSET = TRUE
+!ENDIF
+
+######################
+# debug-zlib-dll
+
+!IF "$(CFG)" == "debug-zlib-dll"
+TARGET =$(LIB_NAME_DEBUG).lib
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKLIB) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)
+CC = $(CCDEBUG) $(CFLAGSZLIB)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# debug-ssl-dll-zlib-dll
+
+!IF "$(CFG)" == "debug-ssl-dll-zlib-dll"
+TARGET =$(LIB_NAME_DEBUG).lib
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKLIB) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB)
/out:$(DIROBJ)\$(TARGET)
+CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
+!ENDIF
+
+######################
+# debug-dll
+
+!IF "$(CFG)" == "debug-dll"
+TARGET =$(LIB_NAME_DEBUG).dll
+DIROBJ =.\$(CFG)
+LNK = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET)
/IMPLIB:"$(DIROBJ)\$(LIB_NAME_DEBUG).lib"
/PDB:"$(DIROBJ)\$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-ssl-dll
+
+!IF "$(CFG)" == "debug-dll-ssl-dll"
+TARGET =$(LIB_NAME_DEBUG).dll
+DIROBJ =.\$(CFG)
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(WINLIBS) $(LFLAGSSSL) /DEBUG
/out:$(DIROBJ)\$(TARGET) /IMPLIB:"$(DIROBJ)\$(LIB_NAME_DEBUG).lib"
/PDB:"$(DIROBJ)\$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSSSL)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-zlib-dll
+
+!IF "$(CFG)" == "debug-dll-zlib-dll"
+TARGET =$(LIB_NAME_DEBUG).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LNK = $(LNKDLL) $(ZLIBLIBSDLL) $(WINLIBS) $(LFLAGSZLIB) /DEBUG
/out:$(DIROBJ)\$(TARGET) /IMPLIB:"$(DIROBJ)\$(LIB_NAME_DEBUG).lib"
/PDB:"$(DIROBJ)\$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSZLIB)
+CFGSET = TRUE
+RESOURCE = $(DIROBJ)\libcurl.res
+!ENDIF
+
+######################
+# debug-dll-ssl-dll-zlib-dll
+
+!IF "$(CFG)" == "debug-dll-ssl-dll-zlib-dll"
+TARGET =$(LIB_NAME_DEBUG).dll
+DIROBJ =.\$(CFG)
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)/out32dll"
+LNK = $(LNKDLL) $(SSLLIBS) $(ZLIBLIBSDLL) $(WINLIBS) $(LFLAGSSSL)
$(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET)
/IMPLIB:"$(DIROBJ)\$(LIB_NAME_DEBUG).lib"
/PDB:"$(DIROBJ)\$(LIB_NAME_DEBUG).pdb"
+CC = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)
+CFGSET = TRUE
RESOURCE = $(DIROBJ)\libcurl.res
!ENDIF
@@ -206,18 +339,28 @@
!IF "$(CFGSET)" == "FALSE"
!MESSAGE Usage: nmake /f makefile.vc6 CFG=<config> <target>
!MESSAGE where <config> is one of:
-!MESSAGE release - release static library
-!MESSAGE release-dll - release dll
-!MESSAGE release-zlib - release static library with zlib
-!MESSAGE release-ssl - release static library with ssl
-!MESSAGE release-ssl-zlib - release static library with ssl and zlib
-!MESSAGE release-ssl-dll - release dll library with ssl
-!MESSAGE release-libcurl-ssl-dll - static libcurl with shared ssl
-!MESSAGE debug - debug static library
-!MESSAGE debug-dll - debug dll
-!MESSAGE debug-zlib - debug static library with zlib
-!MESSAGE debug-ssl - debug static library with ssl
-!MESSAGE debug-ssl-dll - debug dll library with ssl
+!MESSAGE release - release static library
+!MESSAGE release-ssl - release static library with ssl
+!MESSAGE release-zlib - release static library with zlib
+!MESSAGE release-ssl-zlib - release static library with ssl
and zlib
+!MESSAGE release-ssl-dll - release static library with
shared ssl
+!MESSAGE release-zlib-dll - release static library with
shared zlib
+!MESSAGE release-ssl-dll-zlib-dll - release static library with
shared ssl and shared zlib
+!MESSAGE release-dll - release shared library
+!MESSAGE release-dll-ssl-dll - release shared library with
dynamic ssl
+!MESSAGE release-dll-zlib-dll - release shared library with
dynamic zlib1
+!MESSAGE release-dll-ssl-dll-zlib-dll - release shared library with
dynamic ssl and dynamic zlib
+!MESSAGE debug - debug static library
+!MESSAGE debug-ssl - debug static library with ssl
+!MESSAGE debug-zlib - debug static library with zlib
+!MESSAGE debug-ssl-zlib - debug static library with ssl and
zlib
+!MESSAGE debug-ssl-dll - debug static library with shared
ssl
+!MESSAGE debug-zlib-dll - debug static library with shared
zlib
+!MESSAGE debug-ssl-dll-zlib-dll - debug static library with shared
ssl and shared zlib
+!MESSAGE debug-dll - debug shared library
+!MESSAGE debug-dll-ssl-dll - debug shared library with dynamic
ssl
+!MESSAGE debug-dll-zlib-dll - debug shared library with dynamic
zlib1
+!MESSAGE debug-dll-ssl-dll-zlib-dll - debug shared library with dynamic
ssl and dynamic zlib
!MESSAGE <target> can be left blank in which case all is assumed
!ERROR please choose a valid configuration "$(CFG)"
!ENDIF
@@ -281,6 +424,10 @@
$(TARGET): $(X_OBJS)
$(LNK) $(LFLAGS) $(X_OBJS)
+ xcopy $(DIROBJ)\*.dll . /y
+ xcopy $(DIROBJ)\*.lib . /y
+ xcopy $(DIROBJ)\*.exp . /y
+ xcopy $(DIROBJ)\*.pdb . /y
$(X_OBJS): $(DIROBJ)
@@ -293,17 +440,29 @@
$(CC) $(CFLAGS) /Fo"$@" $<
debug-dll\libcurl.res \
-debug-ssl-dll\libcurl.res \
-release-libcurl-ssl-dll\libcurl.res: libcurl.rc
+debug-dll-ssl-dll\libcurl.res \
+debug-dll-zlib-dll\libcurl.res \
+debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
rc /dCURLDEBUG=1 /Fo $@ libcurl.rc
release-dll\libcurl.res \
-release-ssl-dll\libcurl.res \
-release-libcurl-ssl-dll\libcurl.res: libcurl.rc
+release-dll-ssl-dll\libcurl.res \
+release-dll-zlib-dll\libcurl.res \
+release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
rc /dCURLDEBUG=0 /Fo $@ libcurl.rc
clean:
- -_at_erase $(DIROBJ)\*.obj
- -_at_erase $(DIROBJ)\*.res
- -_at_erase vc60.idb
- -_at_erase vc60.pch
+ @erase $(DIROBJ)\*.obj
+ @erase $(DIROBJ)\*.res
+ @erase $(DIROBJ)\*.pdb
+ @erase $(DIROBJ)\*.lib
+ @erase $(DIROBJ)\*.dll
+ @erase $(DIROBJ)\*.exp
+
+distrib: clean
+ @erase *.lib
+ @erase *.dll
+ @erase *.exp
+ @erase *.pdb
+ @erase vc60.idb
+ @erase vc60.pch
Samuel Díaz García
Director Gerente
ArcosCom Wireless, S.L.L.
mailto:samueldg_at_arcoscom.com
http://www.arcoscom.com
móvil: 651 93 72 48
tlfn/fax: 956 70 13 15
Received on 2004-10-06