Commit 833b6df9 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Marcelo Juchem's improvements

parent 0b454311

lib/Makefile.vc6

+5 −5
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ CFGSET = TRUE 
!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:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

LNK    = $(LNKDLL) $(WINLIBS) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

CC     = $(CCDEBUG)

CC     = $(CCDEBUG)

CFGSET = TRUE

CFGSET = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

RESOURCE = $(DIROBJ)\libcurl.res
@@ -333,7 +333,7 @@ RESOURCE = $(DIROBJ)\libcurl.res 
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) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(LFLAGSSSL) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

CC       = $(CCDEBUG) $(CFLAGSSSL)

CC       = $(CCDEBUG) $(CFLAGSSSL)

CFGSET   = TRUE

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

RESOURCE = $(DIROBJ)\libcurl.res
@@ -346,7 +346,7 @@ RESOURCE = $(DIROBJ)\libcurl.res 
TARGET   = $(LIB_NAME_DEBUG).dll

TARGET   = $(LIB_NAME_DEBUG).dll

DIROBJ   = $(CFG)

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

LNK      = $(LNKDLL) $(WINLIBS) $(ZLIBLIBSDLL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

CC       = $(CCDEBUG) $(CFLAGSZLIB)

CC       = $(CCDEBUG) $(CFLAGSZLIB)

CFGSET   = TRUE

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

RESOURCE = $(DIROBJ)\libcurl.res
@@ -360,7 +360,7 @@ TARGET = $(LIB_NAME_DEBUG).dll 
DIROBJ   = $(CFG)

DIROBJ   = $(CFG)

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

LFLAGSZLIB = "/LIBPATH:$(ZLIB_PATH)"

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

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

LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(LIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

LNK      = $(LNKDLL) $(WINLIBS) $(SSLLIBS) $(ZLIBLIBSDLL) $(LFLAGSSSL) $(LFLAGSZLIB) /DEBUG /out:$(DIROBJ)\$(TARGET) /IMPLIB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib /PDB:$(DIROBJ)\$(IMPLIB_NAME_DEBUG).pdb

CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)

CC       = $(CCDEBUG) $(CFLAGSSSL) $(CFLAGSZLIB)

CFGSET   = TRUE

CFGSET   = TRUE

RESOURCE = $(DIROBJ)\libcurl.res

RESOURCE = $(DIROBJ)\libcurl.res
@@ -477,7 +477,7 @@ $(TARGET): $(X_OBJS) 
	-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).dll . /y

	-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).dll . /y

	-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).lib . /y

	-xcopy $(DIROBJ)\$(LIB_NAME_DEBUG).lib . /y

	-xcopy $(DIROBJ)\$(IMPLIB_NAME).lib    . /y

	-xcopy $(DIROBJ)\$(IMPLIB_NAME).lib    . /y

	-xcopy $(DIROBJ)\$(IMPLIB_NAME).lib    . /y

	-xcopy $(DIROBJ)\$(IMPLIB_NAME_DEBUG).lib . /y

	-xcopy $(DIROBJ)\*.exp                 . /y

	-xcopy $(DIROBJ)\*.exp                 . /y

	-xcopy $(DIROBJ)\*.pdb                 . /y

	-xcopy $(DIROBJ)\*.pdb                 . /y