diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/engines/directfb | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
3 files changed, 6 insertions, 8 deletions
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.am b/libraries/evas/src/modules/engines/directfb/Makefile.am index 5b00166..967e594 100644 --- a/libraries/evas/src/modules/engines/directfb/Makefile.am +++ b/libraries/evas/src/modules/engines/directfb/Makefile.am | |||
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \ | |||
11 | @EINA_CFLAGS@ \ | 11 | @EINA_CFLAGS@ \ |
12 | @evas_engine_directfb_cflags@ | 12 | @evas_engine_directfb_cflags@ |
13 | 13 | ||
14 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
15 | |||
16 | if BUILD_ENGINE_DIRECTFB | 14 | if BUILD_ENGINE_DIRECTFB |
17 | 15 | ||
18 | DIRECTFB_SOURCES = evas_engine.c polygon.c | 16 | DIRECTFB_SOURCES = evas_engine.c polygon.c |
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.in b/libraries/evas/src/modules/engines/directfb/Makefile.in index df2f63b..7d642c9 100644 --- a/libraries/evas/src/modules/engines/directfb/Makefile.in +++ b/libraries/evas/src/modules/engines/directfb/Makefile.in | |||
@@ -190,6 +190,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
190 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 190 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
191 | EVIL_LIBS = @EVIL_LIBS@ | 191 | EVIL_LIBS = @EVIL_LIBS@ |
192 | EXEEXT = @EXEEXT@ | 192 | EXEEXT = @EXEEXT@ |
193 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
194 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
193 | FGREP = @FGREP@ | 195 | FGREP = @FGREP@ |
194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 196 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 197 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -240,6 +242,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 242 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
241 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 243 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
242 | PKG_CONFIG = @PKG_CONFIG@ | 244 | PKG_CONFIG = @PKG_CONFIG@ |
245 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
246 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
243 | PNG_CFLAGS = @PNG_CFLAGS@ | 247 | PNG_CFLAGS = @PNG_CFLAGS@ |
244 | PNG_LIBS = @PNG_LIBS@ | 248 | PNG_LIBS = @PNG_LIBS@ |
245 | RANLIB = @RANLIB@ | 249 | RANLIB = @RANLIB@ |
@@ -258,8 +262,6 @@ VERSION = @VERSION@ | |||
258 | VMAJ = @VMAJ@ | 262 | VMAJ = @VMAJ@ |
259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
261 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
262 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
263 | XCB_CFLAGS = @XCB_CFLAGS@ | 265 | XCB_CFLAGS = @XCB_CFLAGS@ |
264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 266 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
265 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 267 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -333,8 +335,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 335 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 336 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 337 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
336 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
337 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -428,7 +428,6 @@ AM_CPPFLAGS = \ | |||
428 | @EINA_CFLAGS@ \ | 428 | @EINA_CFLAGS@ \ |
429 | @evas_engine_directfb_cflags@ | 429 | @evas_engine_directfb_cflags@ |
430 | 430 | ||
431 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
432 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_SOURCES = evas_engine.c polygon.c | 431 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_SOURCES = evas_engine.c polygon.c |
433 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_LIBADD = @evas_engine_directfb_libs@ | 432 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_LIBADD = @evas_engine_directfb_libs@ |
434 | @BUILD_ENGINE_DIRECTFB_TRUE@includes_HEADERS = Evas_Engine_DirectFB.h | 433 | @BUILD_ENGINE_DIRECTFB_TRUE@includes_HEADERS = Evas_Engine_DirectFB.h |
diff --git a/libraries/evas/src/modules/engines/directfb/evas_engine.c b/libraries/evas/src/modules/engines/directfb/evas_engine.c index 17914ab..5347d2d 100644 --- a/libraries/evas/src/modules/engines/directfb/evas_engine.c +++ b/libraries/evas/src/modules/engines/directfb/evas_engine.c | |||
@@ -1138,7 +1138,8 @@ evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x, | |||
1138 | static void | 1138 | static void |
1139 | evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) | 1139 | evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) |
1140 | { | 1140 | { |
1141 | _dfb_polygon_draw(surface, context, polygon, x, y); | 1141 | DirectFB_Engine_Image_Entry *eim = surface; |
1142 | _dfb_polygon_draw(eim->surface, context, polygon, x, y); | ||
1142 | } | 1143 | } |
1143 | #else | 1144 | #else |
1144 | static void | 1145 | static void |