AdminDepLibsCurl

Changes to libCurl Project File

Release/x86

--- "a/curl\\lib\\Makefile.vc10.orig"
+++ "b/curl\\lib\\Makefile.vc10"
@@ -108,15 +108,15 @@ CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
 CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 CFLAGSWINSSL = /DUSE_SCHANNEL
 CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"
-CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /DZLIB_WINAPI /I "$(ZLIB_PATH)"
 CFLAGS       = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
 CFLAGSLIB    = /DCURL_STATICLIB
-LNKDLL       = link.exe /DLL
-LNKLIB       = link.exe /lib
+LNKDLL       = link.exe /DLL /debug /release
+LNKLIB       = link.exe /lib /debug /release
 LFLAGS       = /nologo /machine:$(MACHINE)
 SSLLIBS      = libeay32.lib ssleay32.lib
-ZLIBLIBSDLL  = zdll.lib
-ZLIBLIBS     = zlib.lib
+ZLIBLIBSDLL  = zlib1.lib
+ZLIBLIBS     = zlib1.lib
 WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
 CFLAGS       = $(CFLAGS)

Debug/x86

--- "a/curl\\lib\\Makefile.vc10.orig"
+++ "b/curl\\lib\\Makefile.vc10"
@@ -108,15 +108,15 @@ CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
 CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 CFLAGSWINSSL = /DUSE_SCHANNEL
 CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"
-CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /DZLIB_WINAPI /I "$(ZLIB_PATH)"
 CFLAGS       = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
 CFLAGSLIB    = /DCURL_STATICLIB
-LNKDLL       = link.exe /DLL
-LNKLIB       = link.exe /lib
+LNKDLL       = link.exe /DLL /debug /release
+LNKLIB       = link.exe /lib /debug /release
 LFLAGS       = /nologo /machine:$(MACHINE)
 SSLLIBS      = libeay32.lib ssleay32.lib
-ZLIBLIBSDLL  = zdll.lib
-ZLIBLIBS     = zlib.lib
+ZLIBLIBSDLL  = zlib1d.lib
+ZLIBLIBS     = zlib1d.lib
 WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
 CFLAGS       = $(CFLAGS)

Release/x64

--- "a/curl\\lib\\Makefile.vc10.orig"
+++ "b/curl\\lib\\Makefile.vc10"
@@ -77,7 +77,7 @@ ZLIB_PATH  = ../../zlib-1.2.8
 !ENDIF

 !IFNDEF MACHINE
-MACHINE  = X86
+MACHINE  = X64
 !ENDIF

 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
@@ -108,15 +108,15 @@ CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
 CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 CFLAGSWINSSL = /DUSE_SCHANNEL
 CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"
-CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /DZLIB_WINAPI /I "$(ZLIB_PATH)"
 CFLAGS       = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
 CFLAGSLIB    = /DCURL_STATICLIB
-LNKDLL       = link.exe /DLL
-LNKLIB       = link.exe /lib
+LNKDLL       = link.exe /DLL /debug /release
+LNKLIB       = link.exe /lib /debug /release
 LFLAGS       = /nologo /machine:$(MACHINE)
 SSLLIBS      = libeay32.lib ssleay32.lib
-ZLIBLIBSDLL  = zdll.lib
-ZLIBLIBS     = zlib.lib
+ZLIBLIBSDLL  = zlib1.lib
+ZLIBLIBS     = zlib1.lib
 WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
 CFLAGS       = $(CFLAGS)

Debug/x64

--- "a/curl\\lib\\Makefile.vc10.orig"
+++ "b/curl\\lib\\Makefile.vc10"
@@ -77,7 +77,7 @@ ZLIB_PATH  = ../../zlib-1.2.8
 !ENDIF

 !IFNDEF MACHINE
-MACHINE  = X86
+MACHINE  = X64
 !ENDIF

 # USE_WINDOWS_SSPI uses windows libraries to allow NTLM authentication
@@ -108,15 +108,15 @@ CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
 CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 CFLAGSWINSSL = /DUSE_SCHANNEL
 CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"
-CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
+CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /DZLIB_WINAPI /I "$(ZLIB_PATH)"
 CFLAGS       = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
 CFLAGSLIB    = /DCURL_STATICLIB
-LNKDLL       = link.exe /DLL
-LNKLIB       = link.exe /lib
+LNKDLL       = link.exe /DLL /debug /release
+LNKLIB       = link.exe /lib /debug /release
 LFLAGS       = /nologo /machine:$(MACHINE)
 SSLLIBS      = libeay32.lib ssleay32.lib
-ZLIBLIBSDLL  = zdll.lib
-ZLIBLIBS     = zlib.lib
+ZLIBLIBSDLL  = zlib1d.lib
+ZLIBLIBS     = zlib1d.lib
 WINLIBS      = ws2_32.lib wldap32.lib advapi32.lib
 CFLAGS       = $(CFLAGS)