missing file

SVN revision: 21176
This commit is contained in:
doursse 2006-03-11 01:55:17 +00:00 committed by doursse
parent c4dff4d193
commit a2d6156402
5 changed files with 43 additions and 33 deletions

View File

@ -12,7 +12,8 @@ INCLUDES = \
-I$(top_srcdir)/src/modules/engines/software_win32_gdi \
-I$(top_srcdir)/src/modules/engines/software_x11 \
-I$(top_srcdir)/src/modules/engines/software_xcb \
-I$(top_srcdir)/src/modules/engines/xrender_x11
-I$(top_srcdir)/src/modules/engines/xrender_x11 \
-I$(top_srcdir)/src/modules/engines/xrender_xcb
bin_PROGRAMS = \
@ENGINE_SOFTWARE_X11_PRG@ \
@ -122,8 +123,8 @@ evas_xrender_x11_test_CFLAGS = $(CFLAGS) @x_cflags@
evas_xrender_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
evas_xrender_xcb_test_SOURCES = evas_test_main.h evas_test_main.c evas_xrender_xcb_main.c
evas_xrender_xcb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @XCB_LIBS@
evas_xrender_xcb_test_CFLAGS = $(CFLAGS) @XCB_CFLAGS@
evas_xrender_xcb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @xcb_libs@
evas_xrender_xcb_test_CFLAGS = $(CFLAGS) @xcb_cflags@
evas_xrender_xcb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
EXTRA_DIST = evas_software_qtopia_main.h evas_software_qtopia_main.cpp

View File

@ -42,17 +42,8 @@ else
ENGINE_CAIRO_X11_INC =
endif
if BUILD_ENGINE_XRENDER_XCB
ENGINE_XRENDER_XCB = engines/xrender_xcb/libevas_engine_xrender_xcb.la
ENGINE_XRENDER_XCB_INC = Evas_Engine_XRender_Xcb.h
else
ENGINE_XRENDER_XCB =
ENGINE_XRENDER_XCB_INC =
endif
include_HEADERS = \
$(ENGINE_DIRECTFB_INC) \
$(ENGINE_GL_X11_INC) \
$(ENGINE_XRENDER_XCB_INC)
$(ENGINE_CAIRO_X11_INC)

View File

@ -33,4 +33,5 @@ evas_engine_ximage.c \
evas_engine_xrender.c \
evas_engine_image.c \
evas_engine_font.c \
evas_engine_gradient.c
evas_engine_gradient.c \
Evas_Engine_XRender_X11.h

View File

@ -0,0 +1,25 @@
#ifndef _EVAS_ENGINE_XRENDER_X11_H
#define _EVAS_ENGINE_XRENDER_X11_H
#include <X11/XCB/xcb.h>
typedef struct _Evas_Engine_Info_XRender_Xcb Evas_Engine_Info_XRender_Xcb;
struct _Evas_Engine_Info_XRender_Xcb
{
/* PRIVATE - don't mess with this baby or evas will poke its tongue out */
/* at you and make nasty noises */
Evas_Engine_Info magic;
/* engine specific data & parameters it needs to set up */
struct {
XCBConnection *conn;
XCBDRAWABLE drawable;
XCBPIXMAP mask;
XCBVISUALID visual;
unsigned char destination_alpha : 1;
} info;
};
#endif

View File

@ -1,37 +1,28 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ @XCB_CFLAGS@
INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @xcb_cflags@
if BUILD_ENGINE_XRENDER_XCB
pkgdir = $(libdir)/evas/modules/engines/xrender_xcb/$(MODULE_ARCH)
pkgdir = $(libdir)/evas/modules/engines/xrender_xcb/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
evas_engine.h \
evas_engine.c \
evas_engine_ximage.c \
evas_engine_xrender.c \
evas_engine_image.c \
evas_engine_font.c \
evas_engine_gradient.c \
evas_engine_ximage.c
evas_engine_gradient.c
module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @XCB_LIBS@
module_la_LDFLAGS = -module -avoid-version \
-L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_LIBADD = @xcb_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_DEPENDENCIES = $(top_builddir)/config.h
module_la_DEPENDENCIES = \
$(top_builddir)/config.h
include_HEADERS = Evas_Engine_XRender_Xcb.h
endif
@ -42,4 +33,5 @@ evas_engine_ximage.c \
evas_engine_xrender.c \
evas_engine_image.c \
evas_engine_font.c \
evas_engine_gradient.c
evas_engine_gradient.c \
Evas_Engine_XRender_Xcb.h