diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-09-25 20:01:28 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-09-25 20:01:28 +0800 |
| commit | db2d843ef65a4a5f5034f0ebf8efa053d3065fb1 (patch) | |
| tree | 184f8b5c8d8e8efd0437b376ee20d7c9344e1dd4 | |
| parent | 847f707477753876a0700b1decb2465b3c82506f (diff) | |
| download | gdk-pixbuf-db2d843ef65a4a5f5034f0ebf8efa053d3065fb1.tar.gz | |
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
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf-build-defines.props | 2 | ||||
| -rw-r--r-- | 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 @@ <GdkPixbufBinaryVersion>2.10.0</GdkPixbufBinaryVersion> <GDIP_MACROS>INCLUDE_gdiplus</GDIP_MACROS> <NOGDIP_MACROS>JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;</NOGDIP_MACROS> - <MODULAR_MACROS>INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm</MODULAR_MACROS> + <MODULAR_MACROS>INCLUDE_ani;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_xpm</MODULAR_MACROS> <GdkPixbufDummyPrefix>/dummy</GdkPixbufDummyPrefix> <GdkPixbufPrefixDefine>GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)"</GdkPixbufPrefixDefine> <GdkPixbufLibdirDefine>PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders"</GdkPixbufLibdirDefine> 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 @@ /> <UserMacro Name="MODULAR_MACROS" - Value="INCLUDE_ani;INCLUDE_pcx;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_ras;INCLUDE_wbmp;INCLUDE_xpm" + Value="INCLUDE_ani;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_xpm" /> <UserMacro Name="GdkPixbufDummyPrefix" |