Commit 2ebb87f0 authored by Yang Tse's avatar Yang Tse
Browse files

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.
parent 006b8379

lib/Makefile.vc6

+29 −31
Original line number Diff line number Diff line
@@ -189,6 +189,20 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) 
CFGSET   = TRUE

!ENDIF



######################

# release-ssl-ssh2-zlib



!IF "$(CFG)" == "release-ssl-ssh2-zlib"

TARGET   = $(LIBCURL_STA_LIB_REL)

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF



######################

# release-ssl-dll
@@ -226,36 +240,6 @@ CC = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) 
CFGSET   = TRUE

!ENDIF



######################

# release-ssl-ssh2-zlib



!IF "$(CFG)" == "release-ssl-ssh2-zlib"

TARGET   = $(LIB_NAME).lib

DIROBJ   = $(CFG)

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LNK      = $(LNKLIB) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCNODBG) $(RTLIB) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib

!ENDIF



######################

# debug-ssl-ssh2-zlib



!IF "$(CFG)" == "debug-ssl-ssh2-zlib"

TARGET   = $(LIB_NAME_DEBUG).lib

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

RESOURCE = $(LIBSSH2_PATH)/Release/src/libssh2.lib $(ZLIB_PATH)/zlib.lib

!ENDIF



######################

# release-dll
@@ -356,6 +340,20 @@ CC = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSZLIB) $(CFLAGSLIB) 
CFGSET   = TRUE

!ENDIF



######################

# debug-ssl-ssh2-zlib



!IF "$(CFG)" == "debug-ssl-ssh2-zlib"

TARGET   = $(LIBCURL_STA_LIB_DBG)

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSSSH2 = "/LIBPATH:$(LIBSSH2_PATH)"

LFLAGSSSL = "/LIBPATH:$(OPENSSL_PATH)\out32"

LNK      = $(LNKLIB) $(ZLIBLIBS) $(LFLAGSSSL) $(LFLAGSSSH2) $(LFLAGSZLIB) /out:$(DIROBJ)\$(TARGET)

CC       = $(CCDEBUG) $(RTLIBD) $(CFLAGSSSL) $(CFLAGSSSH2) $(CFLAGSZLIB) $(CFLAGSLIB)

CFGSET   = TRUE

!ENDIF



######################

# debug-ssl-dll
@@ -463,11 +461,11 @@ RESOURCE = $(DIROBJ)\libcurl.res 
!MESSAGE   release-dll-ssl-dll          - release dynamic library with dynamic ssl

!MESSAGE   release-dll-zlib-dll         - release dynamic library with dynamic zlib

!MESSAGE   release-dll-ssl-dll-zlib-dll - release dynamic library with dynamic ssl and dynamic zlib

!MESSAGE   debug-ssl-ssh2-zlib          - debug static library with ssl, ssh2 and 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-ssh2-zlib          - debug static library with ssl, ssh2 and zlib

!MESSAGE   debug-ssl-dll                - debug static library with dynamic ssl

!MESSAGE   debug-zlib-dll               - debug static library with dynamic zlib

!MESSAGE   debug-ssl-dll-zlib-dll       - debug static library with dynamic ssl and dynamic zlib