summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-03-07 13:27:14 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-03-07 13:27:14 +0100
commitdc4d513c4de6f5d8e38e623eacbe59852f48388a (patch)
tree29ee705d21ec8ea7116c35cb9e54a352262a2c2b /gdk-pixbuf
parentaee0eef2964f2dc87d73d3af865db4579993d52b (diff)
rsvglibs: add libjpeg
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/makefile.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 65cb1c276417..8e42c7787861 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -55,15 +55,18 @@ 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 -I$(SOLARINCDIR)$/external$/libpng" \
+ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \
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-libtiff
-## FIXME: libtiff, libjpeg
-
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+## FIXME: libtiff
+
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS=CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external$/libjpeg"
+.ELSE
+CONFIGURE_FLAGS=CPPFLAGS="-I$(SOLARINCDIR)$/external$/libjpeg"
+.ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE)