Mercurial > mxe-octave
changeset 635:f8d5fde6a0ae
corrected dependency library flags for packages cairo and gtk (by Zdenek Hutyra)
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Sat, 16 Jan 2010 22:33:50 +0100 |
| parents | 891ee2b83294 |
| children | 5ed1c054045e |
| files | src/cairo.mk src/gtk.mk |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cairo.mk Tue Jan 12 13:57:46 2010 +0100 +++ b/src/cairo.mk Sat Jan 16 22:33:50 2010 +0100 @@ -65,6 +65,6 @@ --enable-pdf \ --enable-svg \ --disable-pthread \ - LIBS="-lmsimg32 `$(TARGET)-pkg-config pixman-1 --libs`" + LIBS="-lmsimg32 -lgdi32 `$(TARGET)-pkg-config pixman-1 --libs`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- a/src/gtk.mk Tue Jan 12 13:57:46 2010 +0100 +++ b/src/gtk.mk Sat Jan 16 22:33:50 2010 +0100 @@ -50,7 +50,7 @@ $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure' $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure' $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure' - $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure' + $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure' $(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure' # wine confuses the cross-compiling detection, so set it explicitly $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'