diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-04 13:20:07 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-04 13:20:07 +0100 |
| commit | d9698e83a5b9428db2500937181cb344625b7172 (patch) | |
| tree | 09cff03b3c95b6af69d967022684414fae48ddeb /gdk-pixbuf | |
| parent | 1de09f782860838109810c7d42ea7fbde0aeb886 (diff) | |
rsvglibs: add libpng support
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/makefile.mk | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index d723a8c39f78..65cb1c276417 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -55,14 +55,13 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_LIBS=" " \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng" \ LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \ --disable-glibtest \ --without-libtiff \ - --without-libjpeg \ - --without-libpng + --without-libjpeg -## FIXME: libtiff, libjpeg, libpng +## FIXME: libtiff, libjpeg CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) @@ -72,21 +71,21 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(OS)"=="MACOSX" EXTRPATH=LOADER -OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib - -OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders - -OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h -OUT2INC+=gdk-pixbuf/gdk-pixdata.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h -OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h +OUT2LIB+=gdk-pixbuf$/.libs/libgdk_pixbuf-2.0.0.dylib + +OUT2BIN+=gdk-pixbuf$/.libs/gdk-pixbuf-query-loaders + +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-core.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-io.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-simple-anim.h +OUT2INC+=gdk-pixbuf$/gdk-pixdata.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h +OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h .ELIF "$(OS)"=="WNT" .ELSE .ENDIF |