huchi pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ddbc67a01a8c873bad326daeca358e3742b95648
commit ddbc67a01a8c873bad326daeca358e3742b95648 Author: Wonguk Jeong <[email protected]> Date: Thu Aug 21 17:00:21 2014 +0200 emotion: support gstreamer1 for EFL_RUN_IN_TREE/static library --- src/lib/emotion/emotion_modules.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c index 2e95387..6630096 100644 --- a/src/lib/emotion/emotion_modules.c +++ b/src/lib/emotion/emotion_modules.c @@ -9,7 +9,7 @@ Eina_Bool xine_module_init(void); void xine_module_shutdown(void); #endif -#ifdef EMOTION_STATIC_BUILD_GSTREAMER +#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1) Eina_Bool gstreamer_module_init(void); void gstreamer_module_shutdown(void); #endif @@ -73,6 +73,9 @@ _emotion_modules_load(void) #ifdef EMOTION_BUILD_GSTREAMER "gstreamer", #endif +#ifdef EMOTION_BUILD_GSTREAMER1 + "gstreamer1", +#endif #ifdef EMOTION_BUILD_XINE "xine", #endif @@ -112,7 +115,7 @@ emotion_modules_init(void) #ifdef EMOTION_STATIC_BUILD_XINE xine_module_init(); #endif -#ifdef EMOTION_STATIC_BUILD_GSTREAMER +#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1) gstreamer_module_init(); #endif #ifdef EMOTION_STATIC_BUILD_GENERIC @@ -130,7 +133,7 @@ emotion_modules_shutdown(void) #ifdef EMOTION_STATIC_BUILD_XINE xine_module_shutdown(); #endif -#ifdef EMOTION_STATIC_BUILD_GSTREAMER +#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1) gstreamer_module_shutdown(); #endif #ifdef EMOTION_STATIC_BUILD_GENERIC --
