summaryrefslogtreecommitdiff
path: root/legacy/emotion/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-03-25 18:43:21 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-03-25 18:43:21 +0000
commitda77ffd07a3b4fa5d8064f66981edab3b55fba1b (patch)
tree202bb81e7f14bb189a811a03c80986de7ca40cdc /legacy/emotion/src
parent6d8b7c00cbfee54a4c572dd2cd1b4f28076de955 (diff)
Emotion: Fix shm_open check + various autotools cleaning
This works in linux, and should fix shm_detection on BSD (including Mac) BSD, Mac and solaris users : please check that it compiles and shm_open is detected SVN revision: 69618
Diffstat (limited to 'legacy/emotion/src')
-rw-r--r--legacy/emotion/src/generic_players/vlc/Makefile.am2
-rw-r--r--legacy/emotion/src/lib/emotion_main.c26
-rw-r--r--legacy/emotion/src/modules/generic/Makefile.am2
3 files changed, 28 insertions, 2 deletions
diff --git a/legacy/emotion/src/generic_players/vlc/Makefile.am b/legacy/emotion/src/generic_players/vlc/Makefile.am
index 6b00d281c1..ca9d22a92f 100644
--- a/legacy/emotion/src/generic_players/vlc/Makefile.am
+++ b/legacy/emotion/src/generic_players/vlc/Makefile.am
@@ -15,4 +15,4 @@ internal_bin_PROGRAMS = em_generic_vlc
15 15
16em_generic_vlc_SOURCES = emotion_generic_vlc.c 16em_generic_vlc_SOURCES = emotion_generic_vlc.c
17em_generic_vlc_DEPENDENCIES = $(top_srcdir)/src/modules/generic/Emotion_Generic_Plugin.h 17em_generic_vlc_DEPENDENCIES = $(top_srcdir)/src/modules/generic/Emotion_Generic_Plugin.h
18em_generic_vlc_LDADD = @GENERIC_VLC_LIBS@ -lpthread -lrt 18em_generic_vlc_LDADD = @GENERIC_VLC_LIBS@ -lpthread
diff --git a/legacy/emotion/src/lib/emotion_main.c b/legacy/emotion/src/lib/emotion_main.c
index 7fd93e8f6c..a5e9694b80 100644
--- a/legacy/emotion/src/lib/emotion_main.c
+++ b/legacy/emotion/src/lib/emotion_main.c
@@ -2,6 +2,32 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef STDC_HEADERS
6# include <stdlib.h>
7# include <stddef.h>
8#else
9# ifdef HAVE_STDLIB_H
10# include <stdlib.h>
11# endif
12#endif
13#ifdef HAVE_ALLOCA_H
14# include <alloca.h>
15#elif !defined alloca
16# ifdef __GNUC__
17# define alloca __builtin_alloca
18# elif defined _AIX
19# define alloca __alloca
20# elif defined _MSC_VER
21# include <malloc.h>
22# define alloca _alloca
23# elif !defined HAVE_ALLOCA
24# ifdef __cplusplus
25extern "C"
26# endif
27void *alloca (size_t);
28# endif
29#endif
30
5#include <stdio.h> 31#include <stdio.h>
6 32
7#ifdef EMOTION_HAVE_EEZE 33#ifdef EMOTION_HAVE_EEZE
diff --git a/legacy/emotion/src/modules/generic/Makefile.am b/legacy/emotion/src/modules/generic/Makefile.am
index 04fbab540c..23be9873db 100644
--- a/legacy/emotion/src/modules/generic/Makefile.am
+++ b/legacy/emotion/src/modules/generic/Makefile.am
@@ -22,7 +22,7 @@ includesdir = $(includedir)/emotion-@VMAJ@
22noinst_HEADERS = emotion_generic.h 22noinst_HEADERS = emotion_generic.h
23 23
24em_generic_la_SOURCES = emotion_generic.c 24em_generic_la_SOURCES = emotion_generic.c
25em_generic_la_LIBADD = @EMOTION_LIBS@ @SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libemotion.la 25em_generic_la_LIBADD = @EMOTION_LIBS@ @EFL_SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libemotion.la
26em_generic_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 26em_generic_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
27em_generic_la_LIBTOOLFLAGS = --tag=disable-static 27em_generic_la_LIBTOOLFLAGS = --tag=disable-static
28em_generic_la_DEPENDENCIES = emotion_generic.h Emotion_Generic_Plugin.h 28em_generic_la_DEPENDENCIES = emotion_generic.h Emotion_Generic_Plugin.h