diff options
Diffstat (limited to 'external/curl/curl-7.26.0_win.patch')
-rw-r--r-- | external/curl/curl-7.26.0_win.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/external/curl/curl-7.26.0_win.patch b/external/curl/curl-7.26.0_win.patch new file mode 100644 index 000000000000..0b3eed2d2eb6 --- /dev/null +++ b/external/curl/curl-7.26.0_win.patch @@ -0,0 +1,59 @@ +--- curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600 ++++ misc/build/curl-7.26.0/Makefile.msvc.names 2012-07-02 07:20:39.323448800 -0600 +@@ -43,7 +43,7 @@ + !ENDIF + + !IF !DEFINED(LIB_NAME_STA_DBG) || "$(LIB_NAME_STA_DBG)" == "" +-LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL)d ++LIB_NAME_STA_DBG = $(LIB_NAME_STA_REL) + !ENDIF + + !IF !DEFINED(LIB_NAME_DYN_REL) || "$(LIB_NAME_DYN_REL)" == "" +@@ -51,7 +51,7 @@ + !ENDIF + + !IF !DEFINED(LIB_NAME_DYN_DBG) || "$(LIB_NAME_DYN_DBG)" == "" +-LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL)d ++LIB_NAME_DYN_DBG = $(LIB_NAME_DYN_REL) + !ENDIF + + # -------------------------------------------- +@@ -59,11 +59,11 @@ + # -------------------------------------------- + + !IF !DEFINED(LIB_NAME_IMP_REL) || "$(LIB_NAME_IMP_REL)" == "" +-LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL)_imp ++LIB_NAME_IMP_REL = $(LIB_NAME_DYN_REL) + !ENDIF + + !IF !DEFINED(LIB_NAME_IMP_DBG) || "$(LIB_NAME_IMP_DBG)" == "" +-LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG)_imp ++LIB_NAME_IMP_DBG = $(LIB_NAME_DYN_DBG) + !ENDIF + + # -------------------------------------- +--- curl/lib/Makefile.vc9 2012-05-24 12:07:02.000000000 -0400 ++++ curl/lib/Makefile.vc9 2012-10-29 11:53:44.658809300 -0400 +@@ -117,7 +117,7 @@ + ZLIBLIBSDLL= zdll.lib + ZLIBLIBS = zlib.lib + WINLIBS = ws2_32.lib wldap32.lib +-CFLAGS = $(CFLAGS) ++CFLAGS = $(CFLAGS) $(EXCFLAGS) + + CFGSET = FALSE + +@@ -620,11 +620,11 @@ + debug-dll-ssl-dll\libcurl.res \ + debug-dll-zlib-dll\libcurl.res \ + debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc +- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc ++ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc + + release-dll\libcurl.res \ + release-dll-ssl-dll\libcurl.res \ + release-dll-zlib-dll\libcurl.res \ + release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc +- rc /dDEBUGBUILD=0 /Fo $@ libcurl.rc ++ rc $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ libcurl.rc + !ENDIF # End of case where a config was provided. |