From db2d843ef65a4a5f5034f0ebf8efa053d3065fb1 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 25 Sep 2015 20:01:28 +0800 Subject: MSVC Builds: Don't Include the Dropped Loaders The PCX, WBMP and RAS loaders have been dropped, so don't include them. They should be dropped from gdk-pixbuf-io.c as well, otherwise if someone is building with INCLUDE_xxx for them will get linker errors. https://bugzilla.gnome.org/show_bug.cgi?id=721372 --- build/win32/vs10/gdk-pixbuf-build-defines.props | 2 +- build/win32/vs9/gdk-pixbuf-build-defines.vsprops | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/win32/vs10/gdk-pixbuf-build-defines.props b/build/win32/vs10/gdk-pixbuf-build-defines.props index 61a577916..d95b62afa 100644 --- a/build/win32/vs10/gdk-pixbuf-build-defines.props +++ b/build/win32/vs10/gdk-pixbuf-build-defines.props @@ -7,7 +7,7 @@ 2.10.0 INCLUDE_gdiplus JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff; - INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm + INCLUDE_ani;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_xpm /dummy GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)" PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders" diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops index 32b6485ea..ccad986f6 100644 --- a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops +++ b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops @@ -34,7 +34,7 @@ />