Mercurial > mxe-octave
changeset 2189:dc1705c24517
package gdal gdk-pixbuf libpano13: tiff 4 detection workaround
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Fri, 23 Dec 2011 15:31:46 +0100 |
| parents | afa412055a48 |
| children | 861ed76f2041 |
| files | src/gdal.mk src/gdk-pixbuf.mk src/libpano13.mk |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gdal.mk Fri Dec 23 14:36:06 2011 +0100 +++ b/src/gdal.mk Fri Dec 23 15:31:46 2011 +0100 @@ -76,7 +76,7 @@ --without-ruby \ --without-python \ --without-macosx-framework \ - LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl`" + LIBS="-ljpeg -lsecur32 `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j 1 lib-target $(MAKE) -C '$(1)' -j 1 install-lib $(MAKE) -C '$(1)/port' -j 1 install
--- a/src/gdk-pixbuf.mk Fri Dec 23 14:36:06 2011 +0100 +++ b/src/gdk-pixbuf.mk Fri Dec 23 15:31:46 2011 +0100 @@ -27,6 +27,7 @@ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-modules \ - --with-included-loaders + --with-included-loaders \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/libpano13.mk Fri Dec 23 14:36:06 2011 +0100 +++ b/src/libpano13.mk Fri Dec 23 15:31:46 2011 +0100 @@ -32,6 +32,7 @@ --with-jpeg='$(PREFIX)/$(TARGET)'/lib \ --with-tiff='$(PREFIX)/$(TARGET)'/lib \ --with-png='$(PREFIX)/$(TARGET)'/lib \ - --with-zlib='$(PREFIX)/$(TARGET)'/lib + --with-zlib='$(PREFIX)/$(TARGET)'/lib \ + LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef