Enlightenment CVS committal
Author : doursse
Project : e17
Module : apps/expedite
Dir : e17/apps/expedite/src/bin
Modified Files:
Makefile.am main.c main.h
Added Files:
engine_software_xcb.c engine_software_xcb.h
Log Message:
add software xcb engine support, minor reorganization of some inclusing /
checks etc...
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 29 Apr 2008 22:02:30 -0000 1.17
+++ Makefile.am 7 Jul 2008 19:31:46 -0000 1.18
@@ -9,7 +9,8 @@
@EVAS_CFLAGS@ \
@x_cflags@ \
@SDL_CFLAGS@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
bin_PROGRAMS = expedite
@@ -58,7 +59,7 @@
poly_blend.c
expedite_CFLAGS = @WIN32_CFLAGS@
-expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@
@d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ -lm
+expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@
@d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ -lm
expedite_LDFLAGS = @lt_enable_auto_import@
if BUILD_SOFTWARE_X11
@@ -66,34 +67,24 @@
engine_software_x11.c engine_software_x11.h
endif
-if BUILD_OPENGL_X11
-expedite_SOURCES += \
-engine_gl_x11.c engine_gl_x11.h
-endif
-
-if BUILD_SOFTWARE_16_X11
-expedite_SOURCES += \
-engine_software_16_x11.c engine_software_16_x11.h
-endif
-
if BUILD_XRENDER_X11
expedite_SOURCES += \
engine_xrender_x11.c engine_xrender_x11.h
endif
-if BUILD_OPENGL_GLEW
+if BUILD_OPENGL_X11
expedite_SOURCES += \
-engine_gl_glew.c engine_gl_glew.h
+engine_gl_x11.c engine_gl_x11.h
endif
-if BUILD_SOFTWARE_DDRAW
+if BUILD_SOFTWARE_XCB
expedite_SOURCES += \
-engine_software_ddraw.cpp engine_software_ddraw.h
+engine_software_xcb.c engine_software_xcb.h
endif
-if BUILD_SOFTWARE_16_DDRAW
+if BUILD_SOFTWARE_DDRAW
expedite_SOURCES += \
-engine_software_16_ddraw.cpp engine_software_16_ddraw.h
+engine_software_ddraw.cpp engine_software_ddraw.h
endif
if BUILD_DIRECT3D
@@ -101,9 +92,9 @@
engine_direct3d.cpp engine_direct3d.h
endif
-if BUILD_SOFTWARE_16_WINCE
+if BUILD_OPENGL_GLEW
expedite_SOURCES += \
-engine_software_16_wince.c engine_software_16_wince.h
+engine_gl_glew.c engine_gl_glew.h
endif
if BUILD_SOFTWARE_SDL
@@ -119,5 +110,20 @@
if BUILD_DIRECTFB
expedite_SOURCES += \
engine_directfb.c engine_directfb.h
+endif
+
+if BUILD_SOFTWARE_16_X11
+expedite_SOURCES += \
+engine_software_16_x11.c engine_software_16_x11.h
+endif
+
+if BUILD_SOFTWARE_16_DDRAW
+expedite_SOURCES += \
+engine_software_16_ddraw.cpp engine_software_16_ddraw.h
+endif
+
+if BUILD_SOFTWARE_16_WINCE
+expedite_SOURCES += \
+engine_software_16_wince.c engine_software_16_wince.h
endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- main.c 26 May 2008 13:52:26 -0000 1.22
+++ main.c 7 Jul 2008 19:31:46 -0000 1.23
@@ -1186,41 +1186,33 @@
if (engine_software_x11_args(argc, argv))
loop_func = engine_software_x11_loop;
#endif
-#if HAVE_EVAS_OPENGL_GLEW
- if (engine_gl_glew_args(argc, argv))
- loop_func = engine_gl_glew_loop;
+#if HAVE_EVAS_XRENDER_X11
+ if (engine_xrender_x11_args(argc, argv))
+ loop_func = engine_xrender_x11_loop;
#endif
#if HAVE_EVAS_OPENGL_X11
if (engine_gl_x11_args(argc, argv))
loop_func = engine_gl_x11_loop;
#endif
-#if HAVE_EVAS_XRENDER_X11
- if (engine_xrender_x11_args(argc, argv))
- loop_func = engine_xrender_x11_loop;
-#endif
-#if HAVE_EVAS_SOFTWARE_16_X11
- if (engine_software_16_x11_args(argc, argv))
- loop_func = engine_software_16_x11_loop;
+#if HAVE_EVAS_SOFTWARE_XCB
+ if (engine_software_xcb_args(argc, argv))
+ loop_func = engine_software_xcb_loop;
#endif
#if HAVE_EVAS_SOFTWARE_DDRAW
if (engine_software_ddraw_args(argc, argv))
loop_func = engine_software_ddraw_loop;
#endif
-#if HAVE_EVAS_SOFTWARE_16_DDRAW
- if (engine_software_16_ddraw_args(argc, argv))
- loop_func = engine_software_16_ddraw_loop;
-#endif
-#if HAVE_EVAS_SOFTWARE_SDL
- if (engine_software_sdl_args(argc, argv))
- loop_func = engine_software_sdl_loop;
-#endif
#if HAVE_EVAS_DIRECT3D
if (engine_direct3d_args(argc, argv))
loop_func = engine_direct3d_loop;
#endif
-#if HAVE_EVAS_SOFTWARE_16_WINCE
- if (engine_software_16_wince_args(argc, argv))
- loop_func = engine_software_16_wince_loop;
+#if HAVE_EVAS_OPENGL_GLEW
+ if (engine_gl_glew_args(argc, argv))
+ loop_func = engine_gl_glew_loop;
+#endif
+#if HAVE_EVAS_SOFTWARE_SDL
+ if (engine_software_sdl_args(argc, argv))
+ loop_func = engine_software_sdl_loop;
#endif
#if HAVE_EVAS_FB
if (engine_fb_args(argc, argv))
@@ -1230,6 +1222,18 @@
if (engine_directfb_args(argc, argv))
loop_func = engine_directfb_loop;
#endif
+#if HAVE_EVAS_SOFTWARE_16_X11
+ if (engine_software_16_x11_args(argc, argv))
+ loop_func = engine_software_16_x11_loop;
+#endif
+#if HAVE_EVAS_SOFTWARE_16_DDRAW
+ if (engine_software_16_ddraw_args(argc, argv))
+ loop_func = engine_software_16_ddraw_loop;
+#endif
+#if HAVE_EVAS_SOFTWARE_16_WINCE
+ if (engine_software_16_wince_args(argc, argv))
+ loop_func = engine_software_16_wince_loop;
+#endif
if ((!loop_func) || (!profile_ok))
{
fprintf(stderr,
@@ -1249,29 +1253,20 @@
#if HAVE_EVAS_XRENDER_X11
" xr"
#endif
-#if HAVE_EVAS_OPENGL_GLEW
- " gl-glew"
-#endif
#if HAVE_EVAS_OPENGL_X11
" gl"
#endif
-#if HAVE_EVAS_SOFTWARE_16_X11
- " x11-16"
+#if HAVE_EVAS_SOFTWARE_XCB
+ " xcb"
#endif
#if HAVE_EVAS_SOFTWARE_DDRAW
" ddraw"
#endif
-#if HAVE_EVAS_SOFTWARE_16_DDRAW
- " ddraw-16"
-#endif
#if HAVE_EVAS_DIRECT3D
" direct3d"
#endif
-#if HAVE_EVAS_SOFTWARE_16_WINCE
- " wince"
- " wince-fb"
- " wince-gapi"
- " wince-ddraw"
+#if HAVE_EVAS_OPENGL_GLEW
+ " gl-glew"
#endif
#if HAVE_EVAS_SOFTWARE_SDL
" sdl sdl-16"
@@ -1281,6 +1276,18 @@
#endif
#if HAVE_EVAS_DIRECTFB
" directfb"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_X11
+ " x11-16"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_DDRAW
+ " ddraw-16"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_WINCE
+ " wince"
+ " wince-fb"
+ " wince-gapi"
+ " wince-ddraw"
#endif
"\n"
"Where PROFILE can be one of:\n"
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- main.h 25 May 2008 05:15:21 -0000 1.13
+++ main.h 7 Jul 2008 19:31:46 -0000 1.14
@@ -20,29 +20,23 @@
#if HAVE_EVAS_SOFTWARE_X11
#include "engine_software_x11.h"
#endif
-#if HAVE_EVAS_OPENGL_GLEW
-#include "engine_gl_glew.h"
+#if HAVE_EVAS_XRENDER_X11
+#include "engine_xrender_x11.h"
#endif
#if HAVE_EVAS_OPENGL_X11
#include "engine_gl_x11.h"
#endif
-#if HAVE_EVAS_XRENDER_X11
-#include "engine_xrender_x11.h"
-#endif
-#if HAVE_EVAS_SOFTWARE_16_X11
-#include "engine_software_16_x11.h"
+#if HAVE_EVAS_SOFTWARE_XCB
+#include "engine_software_xcb.h"
#endif
#if HAVE_EVAS_SOFTWARE_DDRAW
#include "engine_software_ddraw.h"
#endif
-#if HAVE_EVAS_SOFTWARE_16_DDRAW
-#include "engine_software_16_ddraw.h"
-#endif
#if HAVE_EVAS_DIRECT3D
#include "engine_direct3d.h"
#endif
-#if HAVE_EVAS_SOFTWARE_16_WINCE
-#include "engine_software_16_wince.h"
+#if HAVE_EVAS_OPENGL_GLEW
+#include "engine_gl_glew.h"
#endif
#if HAVE_EVAS_SOFTWARE_SDL
#include "engine_software_sdl.h"
@@ -52,6 +46,15 @@
#endif
#if HAVE_EVAS_DIRECTFB
#include "engine_directfb.h"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_X11
+#include "engine_software_16_x11.h"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_DDRAW
+#include "engine_software_16_ddraw.h"
+#endif
+#if HAVE_EVAS_SOFTWARE_16_WINCE
+#include "engine_software_16_wince.h"
#endif
#include "ui.h"
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
