build: fix RESOURCE bug in lib/Makefile.vc*

Removed two, not intended to exist, RESOURCE declarations.

Bug: http://curl.haxx.se/bug/view.cgi?id=3535977

And sorted configuration hunks to reflect same internal order
as the one shown in the usage message.

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 68ca66bf6bc3305338fe5ba24e420c5fadd6e1c8..1afcf84b143f82d3ee9389ea4f1fa277d3b52c7c 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -189,6 +189,20 @@ CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
+######################\r
+# release-ssl-ssh2-zlib\r
+\r
+!IF "$(CFG)" == "release-ssl-ssh2-zlib"\r
+TARGET   = $(LIBCURL_STA_LIB_REL)\r
+DIROBJ   = $(CFG)\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
 ######################\r
 # release-ssl-dll\r
 \r
@@ -226,36 +240,6 @@ CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
-######################\r
-# release-ssl-ssh2-zlib\r
-\r
-!IF "$(CFG)" == "release-ssl-ssh2-zlib"\r
-TARGET   = $(LIB_NAME).lib\r
-DIROBJ   = $(CFG)\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
-CFGSET   = TRUE\r
-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
-!ENDIF\r
-\r
-######################\r
-# debug-ssl-ssh2-zlib\r
-\r
-!IF "$(CFG)" == "debug-ssl-ssh2-zlib"\r
-TARGET   = $(LIB_NAME_DEBUG).lib\r
-DIROBJ   = $(CFG)\r
-LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
-LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
-LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
-LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
-CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
-CFGSET   = TRUE\r
-RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib\r
-!ENDIF\r
-\r
 ######################\r
 # release-dll\r
 \r
@@ -356,6 +340,20 @@ CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB)
 CFGSET   = TRUE\r
 !ENDIF\r
 \r
+######################\r
+# debug-ssl-ssh2-zlib\r
+\r
+!IF "$(CFG)" == "debug-ssl-ssh2-zlib"\r
+TARGET   = $(LIBCURL_STA_LIB_DBG)\r
+DIROBJ   = $(CFG)\r
+LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"\r
+LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"\r
+LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"\r
+LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)\r
+CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)\r
+CFGSET   = TRUE\r
+!ENDIF\r
+\r
 ######################\r
 # debug-ssl-dll\r
 \r
@@ -463,11 +461,11 @@ RESOURCE = $(DIROBJ)\libcurl.res
 !MESSAGE   release-dll-ssl-dll          - release dynamic library with dynamic ssl\r
 !MESSAGE   release-dll-zlib-dll         - release dynamic library with dynamic zlib\r
 !MESSAGE   release-dll-ssl-dll-zlib-dll - release dynamic library with dynamic ssl and dynamic zlib\r
-!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib\r
 !MESSAGE   debug                        - debug static library\r
 !MESSAGE   debug-ssl                    - debug static library with ssl\r
 !MESSAGE   debug-zlib                   - debug static library with zlib\r
 !MESSAGE   debug-ssl-zlib               - debug static library with ssl and zlib\r
+!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and zlib\r
 !MESSAGE   debug-ssl-dll                - debug static library with dynamic ssl\r
 !MESSAGE   debug-zlib-dll               - debug static library with dynamic zlib\r
 !MESSAGE   debug-ssl-dll-zlib-dll       - debug static library with dynamic ssl and dynamic zlib\r