liberty-xdg: actually make libpng optional
This commit is contained in:
parent
0239a4242a
commit
8d56fae41b
|
@ -21,9 +21,11 @@
|
|||
#ifdef LIBERTY_XDG_WANT_X11
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/Xlib.h>
|
||||
#endif
|
||||
|
||||
#ifdef LIBERTY_XDG_WANT_ICONS
|
||||
#include <png.h>
|
||||
#endif // LIBERTY_XDG_WANT_X11
|
||||
#endif
|
||||
|
||||
// --- XSettings ---------------------------------------------------------------
|
||||
|
||||
|
@ -200,7 +202,7 @@ fail:
|
|||
|
||||
// --- Desktop file parser -----------------------------------------------------
|
||||
|
||||
// Useful for parsing desktop-file-spec, icon-theme-spec, trash-spec,
|
||||
// Useful for parsing desktop-entry-spec, icon-theme-spec, trash-spec,
|
||||
// mime-apps-spec. This code is not designed for making changes to the files.
|
||||
|
||||
struct desktop_file
|
||||
|
@ -434,6 +436,8 @@ desktop_file_get_integer (struct desktop_file *self,
|
|||
|
||||
// This implements part of the Icon Theme Specification.
|
||||
|
||||
#ifdef LIBERTY_XDG_WANT_ICONS
|
||||
|
||||
struct icon_theme_icon
|
||||
{
|
||||
uint32_t width; ///< Width of argb in pixels
|
||||
|
@ -764,3 +768,4 @@ icon_theme_set_window_icon (Display *dpy,
|
|||
}
|
||||
|
||||
#endif // LIBERTY_XDG_WANT_X11
|
||||
#endif // LIBERTY_XDG_WANT_ICONS
|
||||
|
|
|
@ -69,6 +69,7 @@ enum { XUI_KEYMOD_DOUBLE_CLICK = 1 << 15 };
|
|||
#include <X11/Xft/Xft.h>
|
||||
|
||||
#define LIBERTY_XDG_WANT_X11
|
||||
#define LIBERTY_XDG_WANT_ICONS
|
||||
#include "liberty-xdg.c"
|
||||
#endif // LIBERTY_XUI_WANT_X11
|
||||
|
||||
|
|
Loading…
Reference in New Issue