Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Ecore_Evas.h Makefile.am ecore_evas.c
Added Files:
ecore_evas_sdl.c
Log Message:
cedric's SDL egnine patch - finally.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- Ecore_Evas.h 21 Jun 2007 22:49:36 -0000 1.28
+++ Ecore_Evas.h 16 Jul 2007 07:23:11 -0000 1.29
@@ -63,6 +63,7 @@
ECORE_EVAS_ENGINE_XRENDER_X11,
ECORE_EVAS_ENGINE_DIRECTFB,
ECORE_EVAS_ENGINE_SOFTWARE_X11_16,
+ ECORE_EVAS_ENGINE_SDL
} Ecore_Evas_Engine_Type;
#ifndef _ECORE_X_H
@@ -125,6 +126,8 @@
EAPI const int *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
EAPI Evas_Object *ecore_evas_object_image_new(Ecore_Evas *ee_target);
+
+EAPI Ecore_Evas *ecore_evas_sdl_new(const char* name, int w, int h, int
fullscreen, int hwsurface, int noframe, int alpha);
/* generic manipulation calls */
EAPI Ecore_Evas *ecore_evas_ecore_evas_get(Evas *e);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 13 Apr 2007 17:13:16 -0000 1.14
+++ Makefile.am 16 Jul 2007 07:23:11 -0000 1.15
@@ -30,6 +30,16 @@
ECORE_DIRECTFB_LDF =
endif
+if BUILD_ECORE_SDL
+ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl
+ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la
+ECORE_SDL_LDF = -L$(top_builddir)/src/lib/ecore_sdl/.libs
+else
+ECORE_SDL_INC =
+ECORE_SDL_LIB =
+ECORE_SDL_LDF =
+endif
+
INCLUDES = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
@@ -38,6 +48,7 @@
$(ECORE_X_INC) \
$(ECORE_FB_INC) \
$(ECORE_DIRECTFB_INC) \
+$(ECORE_SDL_INC) \
@EVAS_CFLAGS@ \
@XCB_CFLAGS@
@@ -45,6 +56,7 @@
$(ECORE_X_LDF) \
$(ECORE_FB_LDF) \
$(ECORE_DIRECTFB_LDF) \
+$(ECORE_SDL_LDF) \
-L$(top_builddir)/src/lib/ecore/.libs
if BUILD_ECORE_EVAS
@@ -59,12 +71,14 @@
ecore_evas_x.c \
ecore_evas_fb.c \
ecore_evas_buffer.c \
-ecore_evas_directfb.c
+ecore_evas_directfb.c \
+ecore_evas_sdl.c
libecore_evas_la_LIBADD = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
$(ECORE_DIRECTFB_LIB) \
+$(ECORE_SDL_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la \
@EVAS_LIBS@ \
@XCB_LIBS@
@@ -73,6 +87,7 @@
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
$(ECORE_DIRECTFB_LIB) \
+$(ECORE_SDL_LIB) \
$(top_builddir)/src/lib/ecore/libecore.la
endif
@@ -83,5 +98,5 @@
ecore_evas_x.c \
ecore_evas_fb.c \
ecore_evas_buffer.c \
-ecore_evas_directfb.c
-
+ecore_evas_directfb.c \
+ecore_evas_sdl.c
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ecore_evas.c 21 Jun 2007 22:49:36 -0000 1.35
+++ ecore_evas.c 16 Jul 2007 07:23:11 -0000 1.36
@@ -64,8 +64,15 @@
case ECORE_EVAS_ENGINE_DIRECTFB:
#ifdef BUILD_ECORE_EVAS_DIRECTFB
return 1;
-#endif
+#else
return 0;
+#endif
+ case ECORE_EVAS_ENGINE_SDL:
+#ifdef BUILD_ECORE_EVAS_SDL
+ return 1;
+#else
+ return 0;
+#endif
default:
return 0;
break;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
