summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-02-25 17:54:54 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-02-25 17:54:54 +0000
commita1beb50ce77b8200dad7073498e884c0e199f5bb (patch)
tree95c29d330e0957f641301773f4988586dd28dff7
parent98b733080e7265f0375a6f0b3c2eb1016c2d483d (diff)
expedite: remove SDL 16bpp engine support.
SVN revision: 68445
-rw-r--r--configure.ac10
-rw-r--r--src/bin/Makefile.am2
-rw-r--r--src/bin/engine_software_sdl.c20
-rw-r--r--src/bin/main.c3
-rw-r--r--src/bin/main.h2
5 files changed, 7 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac
index a86bb65..47056e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,9 +73,6 @@ AC_SUBST(ddraw_libs)
73EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"]) 73EXPEDITE_CHECK_ENGINE([direct3d], [Direct3D], "yes", [d3d_libs="-ld3d9 -ld3dx9d -lgdi32"])
74AC_SUBST(d3d_libs) 74AC_SUBST(d3d_libs)
75 75
76# Software SDL
77EXPEDITE_CHECK_ENGINE([software-sdl], [Software SDL], "yes")
78
79# PSL1GHT 76# PSL1GHT
80EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes") 77EXPEDITE_CHECK_ENGINE([psl1ght], [PSL1GHT], "yes")
81 78
@@ -175,10 +172,11 @@ fi
175 172
176# SDL 173# SDL
177 174
178if test "x$have_software_sdl" = "xyes" -o "x$have_gl_sdl" = "xyes"; then 175PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
179 PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no"])
180fi
181AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes") 176AM_CONDITIONAL(BUILD_SDL, test "x$have_sdl" = "xyes")
177if test "x$have_sdl" = "xyes"; then
178 AC_DEFINE(BUILD_SDL, 1, [build sdl support])
179fi
182 180
183# PSL1GHT 181# PSL1GHT
184AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes") 182AM_CONDITIONAL(BUILD_PSL1GHT, test "x$have_psl1ght" = "xyes")
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4364810..d9519b6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -187,7 +187,7 @@ expedite_SOURCES += \
187engine_direct3d.cpp engine_direct3d.h 187engine_direct3d.cpp engine_direct3d.h
188endif 188endif
189 189
190if BUILD_SOFTWARE_SDL 190if BUILD_SDL
191expedite_SOURCES += \ 191expedite_SOURCES += \
192engine_software_sdl.c engine_software_sdl.h 192engine_software_sdl.c engine_software_sdl.h
193endif 193endif
diff --git a/src/bin/engine_software_sdl.c b/src/bin/engine_software_sdl.c
index 4a75a48..a786d9f 100644
--- a/src/bin/engine_software_sdl.c
+++ b/src/bin/engine_software_sdl.c
@@ -2,7 +2,6 @@
2#include "main.h" 2#include "main.h"
3 3
4#include <SDL/SDL.h> 4#include <SDL/SDL.h>
5#include <Evas_Engine_SDL.h>
6#include <Evas_Engine_Buffer.h> 5#include <Evas_Engine_Buffer.h>
7 6
8static void * 7static void *
@@ -18,7 +17,6 @@ engine_software_sdl_args(const char *engine, int width, int height)
18 int ok = 0; 17 int ok = 0;
19 18
20 if (!strcmp(engine, "sdl")) ok = 1; 19 if (!strcmp(engine, "sdl")) ok = 1;
21 if (!strcmp(engine, "sdl-16")) ok = 2;
22 if (!ok) return EINA_FALSE; 20 if (!ok) return EINA_FALSE;
23 21
24 if (ok == 1) 22 if (ok == 1)
@@ -64,24 +62,6 @@ engine_software_sdl_args(const char *engine, int width, int height)
64 } 62 }
65 } 63 }
66 } 64 }
67 else
68 {
69 Evas_Engine_Info_SDL *einfo;
70
71 evas_output_method_set(evas, evas_render_method_lookup("software_16_sdl"));
72
73 einfo = (Evas_Engine_Info_SDL *) evas_engine_info_get(evas);
74
75 /* the following is specific to the engine */
76 einfo->info.fullscreen = fullscreen;
77 einfo->info.noframe = 0;
78
79 if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
80 {
81 printf("Evas can not setup the informations of the Software SDL Engine\n");
82 return EINA_FALSE;
83 }
84 }
85 65
86 return EINA_TRUE; 66 return EINA_TRUE;
87} 67}
diff --git a/src/bin/main.c b/src/bin/main.c
index 0b77411..7f01a04 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1158,9 +1158,8 @@ static const Expedite_Engine engines[] = {
1158#if HAVE_EVAS_DIRECT3D 1158#if HAVE_EVAS_DIRECT3D
1159 { "direct3d",engine_direct3d_args, engine_direct3d_loop, engine_direct3d_shutdown }, 1159 { "direct3d",engine_direct3d_args, engine_direct3d_loop, engine_direct3d_shutdown },
1160#endif 1160#endif
1161#if HAVE_EVAS_SOFTWARE_SDL 1161#if BUILD_SDL
1162 { "sdl", engine_software_sdl_args, engine_software_sdl_loop, engine_software_sdl_shutdown }, 1162 { "sdl", engine_software_sdl_args, engine_software_sdl_loop, engine_software_sdl_shutdown },
1163 { "sdl-16",engine_software_sdl_args, engine_software_sdl_loop, engine_software_sdl_shutdown },
1164#endif 1163#endif
1165#if HAVE_EVAS_OPENGL_SDL 1164#if HAVE_EVAS_OPENGL_SDL
1166 { "gl-sdl",engine_gl_sdl_args, engine_gl_sdl_loop, engine_gl_sdl_shutdown }, 1165 { "gl-sdl",engine_gl_sdl_args, engine_gl_sdl_loop, engine_gl_sdl_shutdown },
diff --git a/src/bin/main.h b/src/bin/main.h
index 882c88b..db7a80a 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -49,7 +49,7 @@
49#if HAVE_EVAS_DIRECT3D 49#if HAVE_EVAS_DIRECT3D
50#include "engine_direct3d.h" 50#include "engine_direct3d.h"
51#endif 51#endif
52#if HAVE_EVAS_SOFTWARE_SDL 52#if BUILD_SDL
53#include "engine_software_sdl.h" 53#include "engine_software_sdl.h"
54#endif 54#endif
55#if HAVE_EVAS_OPENGL_SDL 55#if HAVE_EVAS_OPENGL_SDL