diff --git a/configure.ac b/configure.ac index e59ce97..f41cc41 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,9 @@ AC_SUBST(glew_libs) # Software SDL EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes") +# GL SDL +EXPEDITE_CHECK_ENGINE([opengl-sdl], [OpenGL SDL], "yes") + # FB EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes") @@ -166,7 +169,7 @@ fi # SDL -if test "x$have_software_sdl" = "xyes"; then +if test "x$have_software_sdl" = "xyes" -o "x$have_gl_sdl" = "xyes"; then PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"]) fi AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes") @@ -255,6 +258,7 @@ echo " Software DirectDraw..........: ${have_software_ddraw}" echo " Direct3D.....................: ${have_direct3d}" echo " Open GL Glew.................: ${have_opengl_glew}" echo " Software SDL.................: ${have_software_sdl}" +echo " Open GL SDL..................: ${have_opengl_sdl}" echo " FB...........................: ${have_fb}" echo " DirectFB.....................: ${have_directfb}" echo " Quartz.......................: ${have_quartz}" diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 2eae176..8589917 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -151,6 +151,11 @@ expedite_SOURCES += \ engine_software_sdl.c engine_software_sdl.h endif +if BUILD_OPENGL_SDL +expedite_SOURCES += \ +engine_gl_sdl.c engine_gl_sdl.h +endif + if BUILD_FB expedite_SOURCES += \ engine_fb.c engine_fb.h diff --git a/src/bin/main.c b/src/bin/main.c index b32cff0..8ab99cc 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -1268,6 +1268,13 @@ _engine_args(int argc, char **argv) shutdown_func = engine_software_sdl_shutdown; } #endif +#if HAVE_EVAS_OPENGL_SDL + if (engine_gl_sdl_args(argc, argv)) + { + loop_func = engine_gl_sdl_loop; + shutdown_func = engine_gl_sdl_shutdown; + } +#endif #if HAVE_EVAS_FB if (engine_fb_args(argc, argv)) { @@ -1359,6 +1366,9 @@ _engine_args(int argc, char **argv) #if HAVE_EVAS_SOFTWARE_SDL " sdl sdl-16" #endif +#if HAVE_EVAS_OPENGL_SDL + " gl-sdl" +#endif #if HAVE_EVAS_FB " fb" #endif diff --git a/src/bin/main.h b/src/bin/main.h index e5f9bfb..66eb97a 100644 --- a/src/bin/main.h +++ b/src/bin/main.h @@ -51,6 +51,9 @@ #if HAVE_EVAS_SOFTWARE_SDL #include "engine_software_sdl.h" #endif +#if HAVE_EVAS_OPENGL_SDL +#include "engine_gl_sdl.h" +#endif #if HAVE_EVAS_FB #include "engine_fb.h" #endif