Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/expedite
Dir : e17/apps/expedite/src/bin
Modified Files:
Makefile.am engine_direct3d.cpp engine_gl_glew.c
engine_gl_x11.c engine_software_16_ddraw.c
engine_software_16_x11.c engine_software_ddraw.c
engine_software_sdl.c engine_software_x11.c
engine_xrender_x11.c main.c main.h
Log Message:
Clean build system
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 8 Oct 2007 19:24:22 -0000 1.9
+++ Makefile.am 10 Nov 2007 12:17:07 -0000 1.10
@@ -2,7 +2,7 @@
INCLUDES = -I$(includedir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src/bin \
- @EVAS_CFLAGS@ @x_cflags@ @sdl_cflags@ \
+ @EVAS_CFLAGS@ @x_cflags@ @SDL_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"@[EMAIL PROTECTED]" \
-DPACKAGE_LIB_DIR=\"@[EMAIL PROTECTED]" \
-DPACKAGE_DATA_DIR=\"@[EMAIL PROTECTED]"
@@ -11,15 +11,6 @@
expedite_SOURCES = \
main.c main.h \
-engine_software_x11.c engine_software_x11.h \
-engine_gl_glew.c engine_gl_glew.h \
-engine_gl_x11.c engine_gl_x11.h \
-engine_xrender_x11.c engine_xrender_x11.h \
-engine_software_16_x11.c engine_software_16_x11.h \
-engine_software_ddraw.c engine_software_ddraw.h \
-engine_software_16_ddraw.c engine_software_16_ddraw.h \
-engine_direct3d.cpp engine_direct3d.h \
-engine_software_sdl.c engine_software_sdl.h \
ui.c ui.h \
about.c about.h \
tests.h \
@@ -62,4 +53,49 @@
image_blend_occlude3_very_many.c \
poly_blend.c
-expedite_LDFLAGS = @EVAS_LIBS@ @sdl_libs@ @x_libs@ @ddraw_libs@
@ddraw_16_libs@ @d3d_libs@ @glew_libs@ -lm
+expedite_LDFLAGS = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@
@ddraw_16_libs@ @d3d_libs@ @glew_libs@ -lm
+
+if BUILD_SOFTWARE_X11
+expedite_SOURCES += \
+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
+expedite_SOURCES += \
+engine_gl_glew.c engine_gl_glew.h
+endif
+
+if BUILD_SOFTWARE_DDRAW
+expedite_SOURCES += \
+engine_software_ddraw.c engine_software_ddraw.h
+endif
+
+if BUILD_SOFTWARE_16_DDRAW
+expedite_SOURCES += \
+engine_software_16_ddraw.c engine_software_16_ddraw.h
+endif
+
+if BUILD_DIRECT3D
+expedite_SOURCES += \
+engine_direct3d.cpp engine_direct3d.h
+endif
+
+if BUILD_SOFTWARE_SDL
+expedite_SOURCES += \
+engine_software_sdl.c engine_software_sdl.h
+endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_direct3d.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engine_direct3d.cpp 17 Aug 2007 09:39:18 -0000 1.1
+++ engine_direct3d.cpp 10 Nov 2007 12:17:07 -0000 1.2
@@ -1,28 +1,7 @@
#include "main.h"
-
-#ifndef HAVE_DIRECT3D
-
-
-extern "C" {
-
-int
-engine_direct3d_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No Direct3D Engine built\n");
- return 0;
-}
-
-void
-engine_direct3d_loop(void)
-{
-}
-
-}
-
-#else
-# include <windowsx.h>
-# include <Evas_Engine_Direct3D.h>
+#include <windowsx.h>
+#include <Evas_Engine_Direct3D.h>
static HWND window;
@@ -388,5 +367,3 @@
}
-
-#endif /* HAVE_DIRECT3D */
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_gl_glew.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engine_gl_glew.c 5 Aug 2007 07:31:57 -0000 1.1
+++ engine_gl_glew.c 10 Nov 2007 12:17:07 -0000 1.2
@@ -1,19 +1,5 @@
#include "main.h"
-
-#ifndef HAVE_EVAS_GL_GLEW
-int
-engine_gl_glew_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No GL Glew Engine built\n");
- return 0;
-}
-
-void
-engine_gl_glew_loop(void)
-{
-}
-#else
#include <windows.h>
#include <windowsx.h>
#include <GL/glew.h>
@@ -321,5 +307,3 @@
goto again;
}
-
-#endif /* HAVE_EVAS_GL_GLEW */
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_gl_x11.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engine_gl_x11.c 17 Oct 2007 11:55:47 -0000 1.3
+++ engine_gl_x11.c 10 Nov 2007 12:17:07 -0000 1.4
@@ -1,17 +1,5 @@
#include "main.h"
-#ifndef HAVE_EVAS_GL
-int
-engine_gl_x11_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No GL X11 Engine built\n");
- return 0;
-}
-void
-engine_gl_x11_loop(void)
-{
-}
-#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <Evas_Engine_GL_X11.h>
@@ -203,4 +191,3 @@
}
goto again;
}
-#endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_software_16_ddraw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- engine_software_16_ddraw.c 11 Oct 2007 08:30:16 -0000 1.3
+++ engine_software_16_ddraw.c 10 Nov 2007 12:17:07 -0000 1.4
@@ -1,19 +1,5 @@
#include "main.h"
-
-#ifndef HAVE_SOFTWARE_16_DDRAW
-int
-engine_software_16_ddraw_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No 16bits Software DirectDraw Engine built\n");
- return 0;
-}
-
-void
-engine_software_16_ddraw_loop(void)
-{
-}
-#else
#include <windows.h>
#include <windowsx.h>
#include <ddraw.h>
@@ -386,5 +372,3 @@
goto again;
}
-
-#endif /* HAVE_SOFTWARE_DDRAW */
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_software_16_x11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engine_software_16_x11.c 17 Oct 2007 14:27:48 -0000 1.2
+++ engine_software_16_x11.c 10 Nov 2007 12:17:07 -0000 1.3
@@ -1,17 +1,5 @@
#include "main.h"
-#ifndef HAVE_SOFTWARE_16_X11
-int
-engine_software_16_x11_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No Software 16bit X11 Engine built\n");
- return 0;
-}
-void
-engine_software_16_x11_loop(void)
-{
-}
-#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <Evas_Engine_Software_16_X11.h>
@@ -200,4 +188,3 @@
}
goto again;
}
-#endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_software_ddraw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- engine_software_ddraw.c 17 Oct 2007 11:55:47 -0000 1.5
+++ engine_software_ddraw.c 10 Nov 2007 12:17:07 -0000 1.6
@@ -1,19 +1,5 @@
#include "main.h"
-
-#ifndef HAVE_SOFTWARE_DDRAW
-int
-engine_software_ddraw_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No Software DirectDraw Engine built\n");
- return 0;
-}
-
-void
-engine_software_ddraw_loop(void)
-{
-}
-#else
#include <windows.h>
#include <windowsx.h>
#include <ddraw.h>
@@ -374,5 +360,3 @@
goto again;
}
-
-#endif /* HAVE_SOFTWARE_DDRAW */
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_software_sdl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- engine_software_sdl.c 16 Jul 2007 07:27:43 -0000 1.1
+++ engine_software_sdl.c 10 Nov 2007 12:17:07 -0000 1.2
@@ -1,20 +1,5 @@
#include "main.h"
-#ifndef HAVE_SOFTWARE_SDL
-
-int
-engine_software_sdl_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No Software SDL Engine built\n");
- return 0;
-}
-
-void
-engine_software_sdl_loop(void)
-{
-}
-
-#else
#include <SDL/SDL.h>
#include <Evas_Engine_SDL.h>
@@ -44,6 +29,7 @@
einfo->info.noframe = 0;
evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
+ return 1;
}
void
@@ -122,6 +108,8 @@
else
evas_event_feed_key_down(evas, "q", "q", NULL, NULL, 0,
NULL);
break;
+ default:
+ break;
}
break;
case SDL_KEYUP:
@@ -154,6 +142,8 @@
else
evas_event_feed_key_up(evas, "q", "q", NULL, NULL, 0,
NULL);
break;
+ default:
+ break;
}
break;
case SDL_QUIT:
@@ -170,5 +160,3 @@
}
}
}
-
-#endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_software_x11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engine_software_x11.c 17 Oct 2007 14:27:48 -0000 1.2
+++ engine_software_x11.c 10 Nov 2007 12:17:07 -0000 1.3
@@ -1,17 +1,5 @@
#include "main.h"
-#ifndef HAVE_SOFTWARE_X11
-int
-engine_software_x11_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No Software X11 Engine built\n");
- return 0;
-}
-void
-engine_software_x11_loop(void)
-{
-}
-#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <Evas_Engine_Software_X11.h>
@@ -205,4 +193,3 @@
}
goto again;
}
-#endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/engine_xrender_x11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- engine_xrender_x11.c 17 Oct 2007 11:55:47 -0000 1.2
+++ engine_xrender_x11.c 10 Nov 2007 12:17:07 -0000 1.3
@@ -1,17 +1,5 @@
#include "main.h"
-#ifndef HAVE_XRENDER_X11
-int
-engine_xrender_x11_args(int argc, char **argv)
-{
- fprintf(stderr, "ERROR: No XRender X11 Engine built\n");
- return 0;
-}
-void
-engine_xrender_x11_loop(void)
-{
-}
-#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <Evas_Engine_XRender_X11.h>
@@ -200,4 +188,3 @@
}
goto again;
}
-#endif
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- main.c 8 Nov 2007 20:09:43 -0000 1.13
+++ main.c 10 Nov 2007 12:17:07 -0000 1.14
@@ -1136,24 +1136,42 @@
/* FIXME: parse args for geometry, engine etc. */
profile_ok = _profile_parse(argc, argv);
+#if HAVE_EVAS_SOFTWARE_X11
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;
+#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_X11
if (engine_software_16_x11_args(argc, argv))
loop_func = engine_software_16_x11_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 ((!loop_func) || (!profile_ok))
{
fprintf(stderr,
@@ -1164,7 +1182,35 @@
" -p PROFILE\n"
"\n"
"Where ENGINE can be one of:\n"
- " x11 xr gl-glew gl x11-16 ddraw ddraw-16 direct3d sdl\n"
+ " "
+#if HAVE_EVAS_SOFTWARE_X11
+ " x11"
+#endif
+#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"
+#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_SDL
+ " sdl"
+#endif
+ "\n"
"Where PROFILE can be one of:\n"
" qvga qvga-p vga vga-p wvga wvga-p svga svga-p xga xga-p wxga
wxga-p\n"
" n800\n"
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- main.h 8 Oct 2007 19:24:22 -0000 1.7
+++ main.h 10 Nov 2007 12:17:07 -0000 1.8
@@ -14,15 +14,33 @@
#include <Evas.h>
#include "config.h"
+#if HAVE_EVAS_SOFTWARE_X11
#include "engine_software_x11.h"
+#endif
+#if HAVE_EVAS_OPENGL_GLEW
#include "engine_gl_glew.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"
+#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_SDL
#include "engine_software_sdl.h"
+#endif
#include "ui.h"
#include "about.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
