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_16_sdl | |
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 '')
-rw-r--r-- | libraries/evas/src/modules/engines/software_16_sdl/Makefile.am | 4 | ||||
-rw-r--r-- | libraries/evas/src/modules/engines/software_16_sdl/Makefile.in | 50 |
2 files changed, 27 insertions, 27 deletions
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am index af0197d..88204c0 100644 --- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am +++ b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am | |||
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in | |||
4 | 4 | ||
5 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ | 5 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ |
6 | 6 | ||
7 | if BUILD_ENGINE_SOFTWARE_SDL | 7 | if BUILD_ENGINE_SOFTWARE_16_SDL |
8 | 8 | ||
9 | SOFTWARE_SDL_SOURCES = \ | 9 | SOFTWARE_SDL_SOURCES = \ |
10 | evas_engine.c \ | 10 | evas_engine.c \ |
@@ -14,7 +14,7 @@ evas_engine.h | |||
14 | includes_HEADERS = Evas_Engine_SDL_16.h | 14 | includes_HEADERS = Evas_Engine_SDL_16.h |
15 | includesdir = $(includedir)/evas-@VMAJ@ | 15 | includesdir = $(includedir)/evas-@VMAJ@ |
16 | 16 | ||
17 | if !EVAS_STATIC_BUILD_SOFTWARE_SDL | 17 | if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL |
18 | 18 | ||
19 | pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) | 19 | pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) |
20 | pkg_LTLIBRARIES = module.la | 20 | pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in index 6ebf0db..a8f2cc9 100644 --- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in | |||
@@ -84,23 +84,23 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES) | |||
84 | libevas_engine_software_16_sdl_la_DEPENDENCIES = | 84 | libevas_engine_software_16_sdl_la_DEPENDENCIES = |
85 | am__libevas_engine_software_16_sdl_la_SOURCES_DIST = evas_engine.c \ | 85 | am__libevas_engine_software_16_sdl_la_SOURCES_DIST = evas_engine.c \ |
86 | evas_engine.h | 86 | evas_engine.h |
87 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@am__objects_1 = evas_engine.lo | 87 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@am__objects_1 = evas_engine.lo |
88 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_16_sdl_la_OBJECTS = $(am__objects_1) | 88 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_OBJECTS = $(am__objects_1) |
89 | libevas_engine_software_16_sdl_la_OBJECTS = \ | 89 | libevas_engine_software_16_sdl_la_OBJECTS = \ |
90 | $(am_libevas_engine_software_16_sdl_la_OBJECTS) | 90 | $(am_libevas_engine_software_16_sdl_la_OBJECTS) |
91 | AM_V_lt = $(am__v_lt_$(V)) | 91 | AM_V_lt = $(am__v_lt_$(V)) |
92 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | 92 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
93 | am__v_lt_0 = --silent | 93 | am__v_lt_0 = --silent |
94 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_16_sdl_la_rpath = | 94 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_rpath = |
95 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la | 95 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la |
96 | am__module_la_SOURCES_DIST = evas_engine.c evas_engine.h | 96 | am__module_la_SOURCES_DIST = evas_engine.c evas_engine.h |
97 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_1) | 97 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_1) |
98 | module_la_OBJECTS = $(am_module_la_OBJECTS) | 98 | module_la_OBJECTS = $(am_module_la_OBJECTS) |
99 | module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | 99 | module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
100 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 100 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
101 | $(module_la_LDFLAGS) $(LDFLAGS) -o $@ | 101 | $(module_la_LDFLAGS) $(LDFLAGS) -o $@ |
102 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_rpath = -rpath \ | 102 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_rpath = -rpath \ |
103 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@ $(pkgdir) | 103 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@ $(pkgdir) |
104 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 104 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
105 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 105 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
106 | am__depfiles_maybe = depfiles | 106 | am__depfiles_maybe = depfiles |
@@ -188,6 +188,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
188 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 188 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
189 | EVIL_LIBS = @EVIL_LIBS@ | 189 | EVIL_LIBS = @EVIL_LIBS@ |
190 | EXEEXT = @EXEEXT@ | 190 | EXEEXT = @EXEEXT@ |
191 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
192 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
191 | FGREP = @FGREP@ | 193 | FGREP = @FGREP@ |
192 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
193 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -238,6 +240,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
238 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
239 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 241 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
240 | PKG_CONFIG = @PKG_CONFIG@ | 242 | PKG_CONFIG = @PKG_CONFIG@ |
243 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
244 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
241 | PNG_CFLAGS = @PNG_CFLAGS@ | 245 | PNG_CFLAGS = @PNG_CFLAGS@ |
242 | PNG_LIBS = @PNG_LIBS@ | 246 | PNG_LIBS = @PNG_LIBS@ |
243 | RANLIB = @RANLIB@ | 247 | RANLIB = @RANLIB@ |
@@ -256,8 +260,6 @@ VERSION = @VERSION@ | |||
256 | VMAJ = @VMAJ@ | 260 | VMAJ = @VMAJ@ |
257 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 261 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
258 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 262 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
259 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
260 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
261 | XCB_CFLAGS = @XCB_CFLAGS@ | 263 | XCB_CFLAGS = @XCB_CFLAGS@ |
262 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
263 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 265 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -331,8 +333,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
331 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
332 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
333 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
334 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
335 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
336 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 336 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
337 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 337 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
338 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 338 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,20 +418,20 @@ version_info = @version_info@ | |||
418 | AUTOMAKE_OPTIONS = 1.4 foreign | 418 | AUTOMAKE_OPTIONS = 1.4 foreign |
419 | MAINTAINERCLEANFILES = Makefile.in | 419 | MAINTAINERCLEANFILES = Makefile.in |
420 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ | 420 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ |
421 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@SOFTWARE_SDL_SOURCES = \ | 421 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@SOFTWARE_SDL_SOURCES = \ |
422 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@evas_engine.c \ | 422 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.c \ |
423 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@evas_engine.h | 423 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.h |
424 | 424 | ||
425 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL_16.h | 425 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL_16.h |
426 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ | 426 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ |
427 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) | 427 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) |
428 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkg_LTLIBRARIES = module.la | 428 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkg_LTLIBRARIES = module.la |
429 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES) | 429 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES) |
430 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la | 430 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la |
431 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs | 431 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs |
432 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la | 432 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la |
433 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES) | 433 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES) |
434 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@ | 434 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@ |
435 | EXTRA_DIST = \ | 435 | EXTRA_DIST = \ |
436 | evas_engine.c \ | 436 | evas_engine.c \ |
437 | evas_engine.h \ | 437 | evas_engine.h \ |