expedite: remove SDL 16bpp engine support.
SVN revision: 68445
This commit is contained in:
parent
98b733080e
commit
a1beb50ce7
10
configure.ac
10
configure.ac
|
@ -73,9 +73,6 @@ AC_SUBST(ddraw_libs)
|
|||
EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
|
||||
AC_SUBST(d3d_libs)
|
||||
|
||||
# Software SDL
|
||||
EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
|
||||
|
||||
# PSL1GHT
|
||||
EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
|
||||
|
||||
|
@ -175,10 +172,11 @@ fi
|
|||
|
||||
# SDL
|
||||
|
||||
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
|
||||
PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
|
||||
AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes")
|
||||
if test "x$have_sdl" = "xyes"; then
|
||||
AC_DEFINE(BUILD_SDL, 1, [build sdl support])
|
||||
fi
|
||||
|
||||
# PSL1GHT
|
||||
AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes")
|
||||
|
|
|
@ -187,7 +187,7 @@ expedite_SOURCES += \
|
|||
engine_direct3d.cpp engine_direct3d.h
|
||||
endif
|
||||
|
||||
if BUILD_SOFTWARE_SDL
|
||||
if BUILD_SDL
|
||||
expedite_SOURCES += \
|
||||
engine_software_sdl.c engine_software_sdl.h
|
||||
endif
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#include "main.h"
|
||||
|
||||
#include <SDL/SDL.h>
|
||||
#include <Evas_Engine_SDL.h>
|
||||
#include <Evas_Engine_Buffer.h>
|
||||
|
||||
static void *
|
||||
|
@ -18,7 +17,6 @@ engine_software_sdl_args(const char *engine, int width, int height)
|
|||
int ok = 0;
|
||||
|
||||
if (!strcmp(engine, "sdl")) ok = 1;
|
||||
if (!strcmp(engine, "sdl-16")) ok = 2;
|
||||
if (!ok) return EINA_FALSE;
|
||||
|
||||
if (ok == 1)
|
||||
|
@ -64,24 +62,6 @@ engine_software_sdl_args(const char *engine, int width, int height)
|
|||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Evas_Engine_Info_SDL *einfo;
|
||||
|
||||
evas_output_method_set(evas, evas_render_method_lookup("software_16_sdl"));
|
||||
|
||||
einfo = (Evas_Engine_Info_SDL *) evas_engine_info_get(evas);
|
||||
|
||||
/* the following is specific to the engine */
|
||||
einfo->info.fullscreen = fullscreen;
|
||||
einfo->info.noframe = 0;
|
||||
|
||||
if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
|
||||
{
|
||||
printf("Evas can not setup the informations of the Software SDL Engine\n");
|
||||
return EINA_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
|
|
@ -1158,9 +1158,8 @@ static const Expedite_Engine engines[] = {
|
|||
#if HAVE_EVAS_DIRECT3D
|
||||
{ "direct3d",engine_direct3d_args, engine_direct3d_loop, engine_direct3d_shutdown },
|
||||
#endif
|
||||
#if HAVE_EVAS_SOFTWARE_SDL
|
||||
#if BUILD_SDL
|
||||
{ "sdl", engine_software_sdl_args, engine_software_sdl_loop, engine_software_sdl_shutdown },
|
||||
{ "sdl-16",engine_software_sdl_args, engine_software_sdl_loop, engine_software_sdl_shutdown },
|
||||
#endif
|
||||
#if HAVE_EVAS_OPENGL_SDL
|
||||
{ "gl-sdl",engine_gl_sdl_args, engine_gl_sdl_loop, engine_gl_sdl_shutdown },
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
#if HAVE_EVAS_DIRECT3D
|
||||
#include "engine_direct3d.h"
|
||||
#endif
|
||||
#if HAVE_EVAS_SOFTWARE_SDL
|
||||
#if BUILD_SDL
|
||||
#include "engine_software_sdl.h"
|
||||
#endif
|
||||
#if HAVE_EVAS_OPENGL_SDL
|
||||
|
|
Loading…
Reference in New Issue