annotate src/mingw-openssl-3-libdeps.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents d323fdd9e258
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3427
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -ur a/engines/ccgost/Makefile b/engines/ccgost/Makefile
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/engines/ccgost/Makefile 2013-02-11 10:26:04.000000000 -0500
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/engines/ccgost/Makefile 2013-10-14 13:38:18.595806411 -0400
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -32,7 +32,7 @@
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 $(MAKE) -f $(TOP)/Makefile.shared -e \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 LIBNAME=$(LIBNAME) \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 LIBEXTRAS='$(LIBOBJ)' \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 - LIBDEPS='-L$(TOP) -lcrypto' \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 + LIBDEPS='-L$(TOP) -lcrypto -lgdi32' \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 link_o.$(SHLIB_TARGET); \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 else \
d323fdd9e258 limit openssl-3-libdeps.patch to mingw and msvc only.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 $(AR) $(LIB) $(LIBOBJ); \