diff options
author | Peter Foley <pefoley2@verizon.net> | 2012-10-29 10:50:32 -0400 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2012-10-29 12:25:53 -0400 |
commit | 0f075129c95f7aee782bf08b2edbe7c71db1c7b2 (patch) | |
tree | a6dd3dab52ffac33fe742f3e01d3fcc569e61068 /curl/curl-7.26.0_win.patch | |
parent | a3d9253615078a35836c9e79dd694c4540dd5dde (diff) |
convert curl to gbuild
Change-Id: I8c038a0c59660f4fb672d71c08e6ee0b56c302ee
Diffstat (limited to 'curl/curl-7.26.0_win.patch')
-rw-r--r-- | curl/curl-7.26.0_win.patch | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/curl/curl-7.26.0_win.patch b/curl/curl-7.26.0_win.patch index 214b5a9389e7..bcc357c045f4 100644 --- a/curl/curl-7.26.0_win.patch +++ b/curl/curl-7.26.0_win.patch @@ -1,4 +1,4 @@ ---- misc/curl-7.26.0/Makefile.msvc.names 2011-03-19 09:17:12.000000000 -0600 +--- 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 @@ -32,3 +32,21 @@ !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,5 +620,5 @@ + 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. |