diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2018-08-14 17:12:07 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2018-08-14 17:12:07 -0400 |
commit | 7ef8ab559d7821179ce012217a3d997a9cf4b850 (patch) | |
tree | b769d8b8dc3fee03976af4ac550d38998b94337e /src/lib/evas/file/evas_module.c | |
parent | 5ca78073b83ca64ab1e1651e83d27d2279f7482f (diff) |
evas: support wayland static engine loading
Summary: This fixes static loading of the here changes engines.
Reviewers: ManMower, devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6795
Diffstat (limited to '')
-rw-r--r-- | src/lib/evas/file/evas_module.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index 5e6a4d6a53..1aac1c0cc0 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c | |||
@@ -166,8 +166,10 @@ evas_module_paths_init(void) | |||
166 | 166 | ||
167 | #if !EVAS_MODULE_NO_ENGINES | 167 | #if !EVAS_MODULE_NO_ENGINES |
168 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, buffer); | 168 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, buffer); |
169 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, drm); | ||
169 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, fb); | 170 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, fb); |
170 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_generic); | 171 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_generic); |
172 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_drm); | ||
171 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_x11); | 173 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_x11); |
172 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_sdl); | 174 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_sdl); |
173 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_8); | 175 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_8); |
@@ -176,6 +178,8 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw); | |||
176 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi); | 178 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi); |
177 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic); | 179 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic); |
178 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11); | 180 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11); |
181 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, wayland_shm); | ||
182 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, wayland_egl); | ||
179 | #endif | 183 | #endif |
180 | 184 | ||
181 | #if !EVAS_MODULE_NO_VG_LOADERS | 185 | #if !EVAS_MODULE_NO_VG_LOADERS |
@@ -226,12 +230,18 @@ static const struct { | |||
226 | #ifdef EVAS_STATIC_BUILD_BUFFER | 230 | #ifdef EVAS_STATIC_BUILD_BUFFER |
227 | EVAS_EINA_STATIC_MODULE_USE(engine, buffer), | 231 | EVAS_EINA_STATIC_MODULE_USE(engine, buffer), |
228 | #endif | 232 | #endif |
233 | #ifdef EVAS_STATIC_BUILD_DRM | ||
234 | EVAS_EINA_STATIC_MODULE_USE(engine, drm), | ||
235 | #endif | ||
229 | #ifdef EVAS_STATIC_BUILD_FB | 236 | #ifdef EVAS_STATIC_BUILD_FB |
230 | EVAS_EINA_STATIC_MODULE_USE(engine, fb), | 237 | EVAS_EINA_STATIC_MODULE_USE(engine, fb), |
231 | #endif | 238 | #endif |
232 | #ifdef EVAS_STATIC_BUILD_GL_COMMON | 239 | #ifdef EVAS_STATIC_BUILD_GL_COMMON |
233 | EVAS_EINA_STATIC_MODULE_USE(engine, gl_generic), | 240 | EVAS_EINA_STATIC_MODULE_USE(engine, gl_generic), |
234 | #endif | 241 | #endif |
242 | #ifdef EVAS_STATIC_BUILD_GL_DRM | ||
243 | EVAS_EINA_STATIC_MODULE_USE(engine, gl_drm), | ||
244 | #endif | ||
235 | #ifdef EVAS_STATIC_BUILD_GL_X11 | 245 | #ifdef EVAS_STATIC_BUILD_GL_X11 |
236 | EVAS_EINA_STATIC_MODULE_USE(engine, gl_x11), | 246 | EVAS_EINA_STATIC_MODULE_USE(engine, gl_x11), |
237 | #endif | 247 | #endif |
@@ -250,6 +260,12 @@ static const struct { | |||
250 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_X11 | 260 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_X11 |
251 | EVAS_EINA_STATIC_MODULE_USE(engine, software_x11), | 261 | EVAS_EINA_STATIC_MODULE_USE(engine, software_x11), |
252 | #endif | 262 | #endif |
263 | #ifdef EVAS_STATIC_BUILD_WAYLAND_EGL | ||
264 | EVAS_EINA_STATIC_MODULE_USE(engine, wayland_egl), | ||
265 | #endif | ||
266 | #ifdef EVAS_STATIC_BUILD_WAYLAND_SHM | ||
267 | EVAS_EINA_STATIC_MODULE_USE(engine, wayland_shm), | ||
268 | #endif | ||
253 | #endif | 269 | #endif |
254 | #if !EVAS_MODULE_NO_VG_LOADERS | 270 | #if !EVAS_MODULE_NO_VG_LOADERS |
255 | #ifdef EVAS_STATIC_BUILD_VG_SVG | 271 | #ifdef EVAS_STATIC_BUILD_VG_SVG |