awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

draw: switch GTK dependency to GDK and GdkPixbuf 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-06-13 23:24:07 +02:00
parent b16493d878
commit 54f2ebee96
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -109,7 +109,7 @@ AWESOME_CFLAGS = -std=gnu99 -pipe \
-Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn
endif endif
AM_CPPFLAGS = $(pangocairo_CFLAGS) $(AWESOME_CFLAGS) \ AM_CPPFLAGS = $(pangocairo_CFLAGS) $(AWESOME_CFLAGS) \
$(GTK_CFLAGS) $(imlib2_CFLAGS) \ $(GdkPixbuf_CFLAGS) $(GDK_CFLAGS) $(imlib2_CFLAGS) \
$(xcb_CFLAGS) $(xcb_event_CFLAGS) \ $(xcb_CFLAGS) $(xcb_event_CFLAGS) \
$(xcb_randr_CFLAGS) $(xcb_xinerama_CFLAGS) $(xcb_shape_CFLAGS) \ $(xcb_randr_CFLAGS) $(xcb_xinerama_CFLAGS) $(xcb_shape_CFLAGS) \
$(xcb_aux_CFLAGS) $(xcb_atom_CFLAGS) $(xcb_keysyms_CFLAGS) \ $(xcb_aux_CFLAGS) $(xcb_atom_CFLAGS) $(xcb_keysyms_CFLAGS) \
@ -153,7 +153,7 @@ awesome_SOURCES += $(WIDGETS)
awesome_LDADD = $(pangocairo_LIBS) $(xcb_LIBS) $(xcb_event_LIBS) \ awesome_LDADD = $(pangocairo_LIBS) $(xcb_LIBS) $(xcb_event_LIBS) \
$(xcb_randr_LIBS) $(xcb_xinerama_LIBS) $(xcb_shape_LIBS) $(xcb_aux_LIBS) \ $(xcb_randr_LIBS) $(xcb_xinerama_LIBS) $(xcb_shape_LIBS) $(xcb_aux_LIBS) \
$(xcb_atom_LIBS) $(xcb_keysyms_LIBS) $(xcb_icccm_LIBS) $(dbus_LIBS)\ $(xcb_atom_LIBS) $(xcb_keysyms_LIBS) $(xcb_icccm_LIBS) $(dbus_LIBS)\
$(imlib2_LIBS) $(GTK_LIBS) $(Lua_LIBS) $(imlib2_LIBS) $(GdkPixbuf_LIBS) $(GDK_LIBS) $(Lua_LIBS)
bin_PROGRAMS += awesome-client bin_PROGRAMS += awesome-client
awesome_client_SOURCES = \ awesome_client_SOURCES = \

2
common/draw.c
View File

@ -28,7 +28,7 @@
#ifdef WITH_IMLIB2 #ifdef WITH_IMLIB2
#include <Imlib2.h> #include <Imlib2.h>
#else #else
#include <gtk/gtk.h> #include <gdk/gdkcairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#endif #endif

6
configure.ac
View File

@ -144,8 +144,10 @@ if test "x$with_imlib2" == "xyes"; then
[AC_MSG_ERROR([Cannot fined Imlib2.])]) [AC_MSG_ERROR([Cannot fined Imlib2.])])
AC_DEFINE([WITH_IMLIB2],1,[Defined to use Imlib2]) AC_DEFINE([WITH_IMLIB2],1,[Defined to use Imlib2])
else else
PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.2],, PKG_CHECK_MODULES([GdkPixbuf], [gdk-pixbuf-2.0 >= 2.2],,
[AC_MSG_ERROR([Cannot find gtk+-2.0 >= 2.2])]) [AC_MSG_ERROR([Cannot find gdk-pixbuf-2.0 >= 2.2])])
PKG_CHECK_MODULES([GDK], [gdk-2.0 >= 2.2],,
[AC_MSG_ERROR([Cannot find gdk-2.0 >= 2.2])])
fi fi
PKG_CHECK_MODULES([xcb], [xcb],, PKG_CHECK_MODULES([xcb], [xcb],,
[AC_MSG_ERROR([awesome requires xcb.])]) [AC_MSG_ERROR([awesome requires xcb.])])