Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
Makefile.am ewl_media_test.c
Log Message:
- Ewl_Media widget will always be available at runtime now. It will
conditionally compile in the emotion code if it is available.
To determine if ewl_media has support for emotion you can check
ewl_media_is_available(). This will return TRUE if the media support is
available, FALSE otherwise. Also, ewl_media_new() will return NULL if
emotion isn't available.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 6 Feb 2006 03:40:25 -0000 1.17
+++ Makefile.am 22 Feb 2006 17:39:13 -0000 1.18
@@ -4,11 +4,7 @@
AM_CFLAGS = -W -Wall -Wno-implicit
INCLUDES = -I$(top_srcdir)/src/lib
-I$(top_builddir)/src/lib @EDJE_CFLAGS@ @ECORE_CFLAGS@ @EVAS_CFLAGS@
@EMOTION_CFLAGS@
-EWLTESTPROGRAMS = ewl_test ewl_embed_test ewl_simple_test
-if BUILD_EMOTION_SUPPORT
-EWLMEDIATESTPROGRAMS = ewl_media_test
-else
-endif
+EWLTESTPROGRAMS = ewl_test ewl_embed_test ewl_simple_test
ewl_media_test
bin_PROGRAMS = $(EWLTESTPROGRAMS)
$(EWLMEDIATESTPROGRAMS)
@@ -66,13 +62,11 @@
# ewl_simple_test_LDFLAGS =
ewl_simple_test_LDADD = $(top_builddir)/src/lib/libewl.la
@EDJE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EMOTION_LIBS@
-if BUILD_EMOTION_SUPPORT
ewl_media_test_DEPENDENCIES =
$(top_builddir)/src/lib/libewl.la
ewl_media_test_SOURCES = ewl_media_test.c
# ewl_media_test_LDFLAGS =
ewl_media_test_LDADD = $(top_builddir)/src/lib/libewl.la
@EDJE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EMOTION_LIBS@
-endif
EXTRA_DIST = $(ewl_test_SOURCES) \
$(ewl_embed_test_SOURCES) \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_media_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_media_test.c 4 Dec 2005 16:56:29 -0000 1.13
+++ ewl_media_test.c 22 Feb 2006 17:39:13 -0000 1.14
@@ -181,6 +181,13 @@
return 1;
}
+ if (!ewl_media_is_available())
+ {
+ printf("Ewl_Media is not available. Please install Emotion "
+ "and rebuild Ewl\n");
+ return 1;
+ }
+
for (i = 1; i < argc; i++)
{
if (!strcmp(argv[i], "-gstreamer"))
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
