diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-27 13:04:15 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-27 13:04:15 +0100 |
| commit | d7c947bfc6021b9bb74df1e971f89ccc5e241e12 (patch) | |
| tree | 07845b28353859e662f141f6d72cf29f21fba80a /curl | |
| parent | 509b7c488df75e3677fad248507c39468af84b4e (diff) | |
tkr32: #i105917# seperate windows patch file
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-7.19.7.patch | 19 | ||||
| -rw-r--r-- | curl/curl-7.19.7_win.patch | 19 | ||||
| -rw-r--r-- | curl/makefile.mk | 6 |
3 files changed, 25 insertions, 19 deletions
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch index 6998379e2381..0e39cb700a35 100644 --- a/curl/curl-7.19.7.patch +++ b/curl/curl-7.19.7.patch @@ -42,25 +42,6 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ---- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 -+++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 -@@ -46,13 +46,13 @@ - # Stem for static libs and DLLs - # - LIB_NAME = libcurl --LIB_NAME_DEBUG = libcurld -+LIB_NAME_DEBUG = libcurl - - # - # Stem for DLL import libs - # --IMPLIB_NAME = libcurl_imp --IMPLIB_NAME_DEBUG = libcurld_imp -+IMPLIB_NAME = libcurl -+IMPLIB_NAME_DEBUG = libcurl - - !IFNDEF OPENSSL_PATH - OPENSSL_PATH = ../../openssl-0.9.8g --- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100 +++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100 @@ -193,6 +193,7 @@ diff --git a/curl/curl-7.19.7_win.patch b/curl/curl-7.19.7_win.patch new file mode 100644 index 000000000000..bc59433b5ef1 --- /dev/null +++ b/curl/curl-7.19.7_win.patch @@ -0,0 +1,19 @@ +--- misc/curl-7.19.7/lib/Makefile.vc9 2009-11-04 13:35:39.000000000 +0100 ++++ misc/build/curl-7.19.7/lib/Makefile.vc9 2009-11-18 12:32:57.234375000 +0100 +@@ -46,13 +46,13 @@ + # Stem for static libs and DLLs + # + LIB_NAME = libcurl +-LIB_NAME_DEBUG = libcurld ++LIB_NAME_DEBUG = libcurl + + # + # Stem for DLL import libs + # +-IMPLIB_NAME = libcurl_imp +-IMPLIB_NAME_DEBUG = libcurld_imp ++IMPLIB_NAME = libcurl ++IMPLIB_NAME_DEBUG = libcurl + + !IFNDEF OPENSSL_PATH + OPENSSL_PATH = ../../openssl-0.9.8g diff --git a/curl/makefile.mk b/curl/makefile.mk index e20542723f0c..9ab1199e1bc3 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -47,6 +47,12 @@ all: TARFILE_NAME=curl-7.19.7 PATCH_FILES=curl-7.19.7.patch + +.IF "$(GUI)"=="WNT" + PATCH_FILES+=curl-7.19.7_win.patch +.ENDIF + + #CONVERTFILES= \ lib$/Makefile.vc6 |