← Back to branch summary

~ubuntu-branches/ubuntu/quantal/curl/quantal

« back to all changes in this revision

Viewing changes to lib/Makefile.vc8

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-10-20 09:28:24 UTC
  • mfrom: (3.4.22 sid)
  • Revision ID: james.westby@ubuntu.com-20111020092824-i7kfjd5we7dh57nv
Tags: 7.21.7-3ubuntu1
https://launchpad.net/bugs/831496
* Merge from Debian testing, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package, stripped down for use during 
    installation (LP: #831496).
* Dropped changes:
  - debian/patches/timeout_bug_736216: applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Makefile.vc8
101
101
CCDEBUG    = cl.exe /Od /Gm /Zi /D_DEBUG /RTC1
102
102
CFLAGSSSL  = /DUSE_SSLEAY /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
103
103
CFLAGSZLIB = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"
104
 
CFLAGS     = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
 
104
CFLAGS     = /I. /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
105
105
CFLAGSLIB  = /DCURL_STATICLIB
106
106
LNKDLL     = link.exe /DLL
107
107
LNKLIB     = link.exe /lib
457
457
# A config was provided, so the library can be built.
458
458
#
459
459
X_OBJS= \
 
460
        $(DIROBJ)\asyn-ares.obj \
 
461
        $(DIROBJ)\asyn-thread.obj \
460
462
        $(DIROBJ)\base64.obj \
461
463
        $(DIROBJ)\connect.obj \
462
464
        $(DIROBJ)\content_encoding.obj \
479
481
        $(DIROBJ)\ftp.obj \
480
482
        $(DIROBJ)\getenv.obj \
481
483
        $(DIROBJ)\getinfo.obj \
 
484
        $(DIROBJ)\gopher.obj \
482
485
        $(DIROBJ)\gtls.obj \
483
 
        $(DIROBJ)\gopher.obj \
484
486
        $(DIROBJ)\hash.obj \
485
487
        $(DIROBJ)\hmac.obj \
486
 
        $(DIROBJ)\hostares.obj \
487
488
        $(DIROBJ)\hostasyn.obj \
488
489
        $(DIROBJ)\hostip4.obj \
489
490
        $(DIROBJ)\hostip6.obj \
490
491
        $(DIROBJ)\hostip.obj \
491
492
        $(DIROBJ)\hostsyn.obj \
492
 
        $(DIROBJ)\hostthre.obj \
493
493
        $(DIROBJ)\http_chunks.obj \
494
494
        $(DIROBJ)\http_digest.obj \
495
495
        $(DIROBJ)\http_negotiate.obj \