Kaydet (Commit) b0d2187b authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Make gdk-pixbuf build better

Pass the -I options needed in CPPFLAGS, not CFLAGS.  Explicitly
disable dynamic loading of loaders. Pass an explicit list of loaders
to build in statically. Do include the jpeg loader.
üst d0618920
...@@ -55,12 +55,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ ...@@ -55,12 +55,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
BASE_DEPENDENCIES_LIBS=" " \ BASE_DEPENDENCIES_LIBS=" " \
.$/configure \ .$/configure \
CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
--disable-nls \ --disable-nls \
CPPFLAGS="$(EXTRA_CDEFS)" \ --disable-modules \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --disable-glibtest --without-libtiff --without-libjasper
--disable-glibtest --without-libtiff --without-libjpeg
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment