dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emotion: properly fix build of vlc generic player.

This commit is contained in:
Cedric BAIL 2016-06-02 10:43:29 -07:00
parent 63a1de1263
commit 0a7b668249
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -4996,9 +4996,7 @@ fi
### Check availability
## Generic player
EFL_DEPEND_PKG([GENERIC_VLC], [VLC], [libvlc >= 2.0])
EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [eina])
EFL_INTERNAL_DEPEND_PKG([GENERIC_VLC], [ecore])
EMOTION_GENERIC_PLAYER([GENERIC_VLC], [VLC], [libvlc >= 2.0])
EFL_ADD_FEATURE([EMOTION], [generic_vlc], [${with_generic_vlc}])
EFL_LIB_END([Emotion])

8
src/Makefile_Emotion.am
View File

@ -365,6 +365,10 @@ if HAVE_GENERIC_VLC
emotiongenericplayers_PROGRAMS += generic/emotion/vlc/vlc
generic_emotion_vlc_vlc_SOURCES = generic/emotion/vlc/emotion_generic_vlc.c
generic_emotion_vlc_vlc_CPPFLAGS = \
-I$(top_srcdir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/modules/emotion/generic \
-I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@ -373,6 +377,6 @@ generic_emotion_vlc_vlc_CPPFLAGS = \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DEMOTION_GENERIC_PLAYERS_DIR=\"$(libdir)/emotion/generic_players/$(MODULE_ARCH)\" \
@GENERIC_VLC_CFLAGS@
generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@
generic_emotion_vlc_vlc_LDADD = @GENERIC_VLC_LIBS@ @USE_EINA_LIBS@ @USE_ECORE_LIBS@
generic_emotion_vlc_vlc_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@
endif