summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-01-04 18:45:40 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-01-04 18:45:40 +0000
commit2a1b159536aa73770a769ee32c06f47515a86b69 (patch)
tree42874be2b49b0294ef8751c61fedb7419f0ea308 /legacy/emotion/src/lib
parenta4b0afb1e4b467a1ce7c605095b7da5cb01db275 (diff)
* enable static build of modules
* clean up autotools * remove some warnings issues: * vlc backend can not be built on my computer(API change in libvlc, it seems) * when i build xine *and* gstreamer as static, i get a multiple defined of __eina_module_init and __eina_module_shutdown SVN revision: 44884
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/Makefile.am62
-rw-r--r--legacy/emotion/src/lib/emotion_private.h15
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c6
3 files changed, 65 insertions, 18 deletions
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index d2bb4adc78..76e69ab52f 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -7,16 +7,62 @@ AM_CPPFLAGS = \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EVAS_CFLAGS@ \ 10@EMOTION_CPPFLAGS@ \
11@ECORE_CFLAGS@ \ 11@EMOTION_CFLAGS@ \
12@EFL_EMOTION_BUILD@ 12@EFL_EMOTION_BUILD@
13 13
14if EMOTION_STATIC_BUILD_XINE
15AM_CPPFLAGS += @XINE_CFLAGS@
16endif
17
18if EMOTION_STATIC_BUILD_GSTREAMER
19AM_CPPFLAGS += @GSTREAMER_CFLAGS@
20endif
21
22if EMOTION_STATIC_BUILD_VLC
23AM_CPPFLAGS += @VLC_CFLAGS@
24endif
25
14lib_LTLIBRARIES = libemotion.la 26lib_LTLIBRARIES = libemotion.la
15include_HEADERS = Emotion.h 27include_HEADERS = Emotion.h
16libemotion_la_SOURCES = \ 28libemotion_la_SOURCES = emotion_smart.c
17emotion_smart.c \ 29
18emotion_private.h 30if EMOTION_STATIC_BUILD_XINE
31libemotion_la_SOURCES += \
32$(top_srcdir)/src/modules/xine/emotion_xine.c \
33$(top_srcdir)/src/modules/xine/emotion_xine_vo_out.c
34endif
35
36if EMOTION_STATIC_BUILD_GSTREAMER
37libemotion_la_SOURCES += \
38$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
39$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c \
40$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c \
41$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c \
42$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c \
43$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c \
44$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_v4l.c
45endif
46
47if EMOTION_STATIC_BUILD_VLC
48libemotion_la_SOURCES += \
49$(top_srcdir)/src/modules/vlc/emotion_vlc.c
50endif
51
52libemotion_la_LIBADD = @EMOTION_LIBS@
53
54if EMOTION_STATIC_BUILD_XINE
55libemotion_la_LIBADD += @XINE_LIBS@
56endif
57
58if EMOTION_STATIC_BUILD_GSTREAMER
59libemotion_la_LIBADD += @GSTREAMER_LIBS@
60endif
61
62if EMOTION_STATIC_BUILD_VLC
63libemotion_la_LIBADD += @VLC_LIBS@
64endif
65
66libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
19 67
20libemotion_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ 68EXTRA_DIST = emotion_private.h
21libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
22libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index 1fb6166391..adf1f255d2 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -1,18 +1,19 @@
1#ifndef EMOTION_PRIVATE_H 1#ifndef EMOTION_PRIVATE_H
2#define EMOTION_PRIVATE_H 2#define EMOTION_PRIVATE_H
3 3
4#include <Evas.h> 4#ifdef HAVE_CONFIG_H
5#include <Ecore.h> 5# include "config.h"
6#include <Ecore_Job.h> 6#endif
7#include <Ecore_Data.h>
8#include <Ecore_Str.h>
9#include <Emotion.h>
10 7
11#include <stdlib.h> 8#include <stdlib.h>
12#include <stdio.h> 9#include <stdio.h>
13#include <string.h> 10#include <string.h>
14 11
15#include "config.h" 12#include <Evas.h>
13#include <Ecore.h>
14#include <Ecore_Job.h>
15#include <Ecore_Str.h>
16#include <Emotion.h>
16 17
17#define META_TRACK_TITLE 1 18#define META_TRACK_TITLE 1
18#define META_TRACK_ARTIST 2 19#define META_TRACK_ARTIST 2
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index e3c54b417f..ba733f2fbb 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -119,7 +119,7 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **
119{ 119{
120 Eina_Emotion_Plugins *plugin; 120 Eina_Emotion_Plugins *plugin;
121 Smart_Data *sd; 121 Smart_Data *sd;
122 int index = 0; 122 unsigned int index = 0;
123 123
124 E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); 124 E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
125 if (!_backends) 125 if (!_backends)
@@ -1028,7 +1028,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
1028/****************************/ 1028/****************************/
1029 1029
1030static void 1030static void
1031_mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info) 1031_mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
1032{ 1032{
1033 Evas_Event_Mouse_Move *e; 1033 Evas_Event_Mouse_Move *e;
1034 Smart_Data *sd; 1034 Smart_Data *sd;
@@ -1048,7 +1048,7 @@ _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info)
1048} 1048}
1049 1049
1050static void 1050static void
1051_mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info) 1051_mouse_down(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
1052{ 1052{
1053 Evas_Event_Mouse_Down *e; 1053 Evas_Event_Mouse_Down *e;
1054 Smart_Data *sd; 1054 Smart_Data *sd;