curl/curl-7.26.0_win.patch

   1 --- curl-7.26.0/Makefile.msvc.names     2011-03-19 09:17:12.000000000 -0600
   2 +++ misc/build/curl-7.26.0/Makefile.msvc.names  2012-07-02 07:20:39.323448800 -0600
   3 @@ -43,7 +43,7 @@
   4  !ENDIF
   5
   6  !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == ""
   7 -LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d
   8 +LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)
   9  !ENDIF
  10
  11  !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == ""
  12 @@ -51,7 +51,7 @@
  13  !ENDIF
  14
  15  !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == ""
  16 -LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d
  17 +LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)
  18  !ENDIF
  19
  20  # --------------------------------------------
  21 @@ -59,11 +59,11 @@
  22  # --------------------------------------------
  23
  24  !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == ""
  25 -LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp
  26 +LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)
  27  !ENDIF
  28
  29  !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == ""
  30 -LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp
  31 +LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)
  32  !ENDIF
  33
  34  # --------------------------------------
  35 --- curl/lib/Makefile.vc9       2012-05-24 12:07:02.000000000 -0400
  36 +++ curl/lib/Makefile.vc9       2012-10-29 11:53:44.658809300 -0400
  37 @@ -117,7 +117,7 @@
  38  ZLIBLIBSDLL= zdll.lib
  39  ZLIBLIBS   = zlib.lib
  40  WINLIBS    = ws2_32.lib wldap32.lib
  41 -CFLAGS     = $(CFLAGS)
  42 +CFLAGS     = $(CFLAGS) $(EXCFLAGS)
  43
  44  CFGSET     = FALSE
  45
  46 @@ -620,5 +620,5 @@
  47  release-dll-ssl-dll\libcurl.res \
  48  release-dll-zlib-dll\libcurl.res \
  49  release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc
  50 -       rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc
  51 +       rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc
  52  !ENDIF  # End of case where a config was provided.