diff options
Diffstat (limited to 'external/curl/curl-msvc.patch.1')
| -rw-r--r-- | external/curl/curl-msvc.patch.1 | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 new file mode 100644 index 000000000000..42970d3319ad --- /dev/null +++ b/external/curl/curl-msvc.patch.1 @@ -0,0 +1,27 @@ +MSVC: using SOLARINC and EXCFLAGS + +--- 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 advapi32.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. |