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/software_8 | |
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, 8 insertions, 11 deletions
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.am b/libraries/evas/src/modules/engines/software_8/Makefile.am index 145b766..46637fb 100644 --- a/libraries/evas/src/modules/engines/software_8/Makefile.am +++ b/libraries/evas/src/modules/engines/software_8/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @PIXMAN_CFLAGS@ \ | 10 | @PIXMAN_CFLAGS@ \ |
11 | @EINA_CFLAGS@ | 11 | @EINA_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_ENGINE_SOFTWARE_8 | 13 | if BUILD_ENGINE_SOFTWARE_8 |
16 | 14 | ||
17 | SOFTWARE_8_SOURCES = evas_engine.c | 15 | SOFTWARE_8_SOURCES = evas_engine.c |
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.in b/libraries/evas/src/modules/engines/software_8/Makefile.in index 3ee42fd..6da6bbb 100644 --- a/libraries/evas/src/modules/engines/software_8/Makefile.in +++ b/libraries/evas/src/modules/engines/software_8/Makefile.in | |||
@@ -184,6 +184,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
184 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 184 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
185 | EVIL_LIBS = @EVIL_LIBS@ | 185 | EVIL_LIBS = @EVIL_LIBS@ |
186 | EXEEXT = @EXEEXT@ | 186 | EXEEXT = @EXEEXT@ |
187 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
188 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
187 | FGREP = @FGREP@ | 189 | FGREP = @FGREP@ |
188 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 190 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
189 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 191 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -234,6 +236,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
234 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 236 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
235 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 237 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
236 | PKG_CONFIG = @PKG_CONFIG@ | 238 | PKG_CONFIG = @PKG_CONFIG@ |
239 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
240 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
237 | PNG_CFLAGS = @PNG_CFLAGS@ | 241 | PNG_CFLAGS = @PNG_CFLAGS@ |
238 | PNG_LIBS = @PNG_LIBS@ | 242 | PNG_LIBS = @PNG_LIBS@ |
239 | RANLIB = @RANLIB@ | 243 | RANLIB = @RANLIB@ |
@@ -252,8 +256,6 @@ VERSION = @VERSION@ | |||
252 | VMAJ = @VMAJ@ | 256 | VMAJ = @VMAJ@ |
253 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 257 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
254 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 258 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
255 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
256 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
257 | XCB_CFLAGS = @XCB_CFLAGS@ | 259 | XCB_CFLAGS = @XCB_CFLAGS@ |
258 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 260 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
259 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 261 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -327,8 +329,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
327 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 329 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
328 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 330 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
329 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 331 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
330 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
331 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
332 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 332 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
333 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 333 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
334 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 334 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -421,7 +421,6 @@ AM_CPPFLAGS = \ | |||
421 | @PIXMAN_CFLAGS@ \ | 421 | @PIXMAN_CFLAGS@ \ |
422 | @EINA_CFLAGS@ | 422 | @EINA_CFLAGS@ |
423 | 423 | ||
424 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
425 | @BUILD_ENGINE_SOFTWARE_8_TRUE@SOFTWARE_8_SOURCES = evas_engine.c | 424 | @BUILD_ENGINE_SOFTWARE_8_TRUE@SOFTWARE_8_SOURCES = evas_engine.c |
426 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH) | 425 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH) |
427 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la | 426 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in b/libraries/evas/src/modules/engines/software_8_x11/Makefile.in index 22577af..3231fd1 100644 --- a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in +++ b/libraries/evas/src/modules/engines/software_8_x11/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |