* evas: fix static build of GL SDL engine.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@54589 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index c3771b2..178355f 100644 (file)
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -576,11 +576,6 @@ else
       [
 #include <SDL/SDL_opengles.h>
 #include <EGL/egl.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/Xresource.h>
       ])
    if test "x${have_egl}" = "xyes" ; then
       AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm $gl_pt_lib)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 289f486..16e0def 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -43,6 +43,14 @@ EVAS_STATIC_MODULE += \
        ../modules/engines/gl_x11/libevas_engine_gl_x11.la
 EVAS_STATIC_LIBADD += @evas_engine_gl_common_libs@ @evas_engine_gl_x11_libs@
 endif
+if EVAS_STATIC_BUILD_GL_SDL
+SUBDIRS += \
+       ../modules/engines/gl_common \
+       ../modules/engines/gl_sdl
+EVAS_STATIC_MODULE += \
+       ../modules/engines/gl_sdl/libevas_engine_gl_sdl.la
+EVAS_STATIC_LIBADD += @evas_engine_gl_common_libs@ @evas_engine_gl_sdl_libs@
+endif
 if EVAS_STATIC_BUILD_QUARTZ
 SUBDIRS += ../modules/engines/quartz/
 EVAS_STATIC_MODULE += ../modules/engines/quartz/libevas_engine_quartz.la

diff --git a/src/lib/file/evas_module.c b/src/lib/file/evas_module.c
index a78ff97..241bb66 100644 (file)
--- a/src/lib/file/evas_module.c
+++ b/src/lib/file/evas_module.c
@@ -99,6 +99,7 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, directfb);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, fb);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_glew);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_x11);
+EVAS_EINA_STATIC_MODULE_DEFINE(engine, gl_sdl);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, quartz);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_16);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_16_ddraw);
@@ -156,6 +157,9 @@ static const struct {
 #ifdef EVAS_STATIC_BUILD_GL_X11
   EVAS_EINA_STATIC_MODULE_USE(engine, gl_x11),
 #endif
+#ifdef EVAS_STATIC_BUILD_GL_SDL
+  EVAS_EINA_STATIC_MODULE_USE(engine, gl_sdl),
+#endif
 #ifdef EVAS_STATIC_BUILD_QUARTZ
   EVAS_EINA_STATIC_MODULE_USE(engine, quartz),
 #endif
@@ -278,8 +282,8 @@ evas_module_register(const Evas_Module_Api *module, Evas_Module_Type type)
    Evas_Module *em;
 
    if ((unsigned int)type > 3) return EINA_FALSE;
-   if (module->version != EVAS_MODULE_API_VERSION) return EINA_FALSE;
    if (!module) return EINA_FALSE;
+   if (module->version != EVAS_MODULE_API_VERSION) return EINA_FALSE;
 
    em = eina_hash_find(evas_modules[type], module->name);
    if (em) return EINA_FALSE;

diff --git a/src/modules/engines/gl_sdl/evas_engine.c b/src/modules/engines/gl_sdl/evas_engine.c
index b49016f..ec8edbf 100644 (file)
--- a/src/modules/engines/gl_sdl/evas_engine.c
+++ b/src/modules/engines/gl_sdl/evas_engine.c
@@ -175,7 +175,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
 
    re = (Render_Engine *)data;
    evas_gl_common_context_flush(re->gl_context);
-   evas_gl_common_context_newframe(re->win->gl_context);
+   evas_gl_common_context_newframe(re->gl_context);
    /* get the upate rect surface - return engine data as dummy */
    if (!re->draw.redraw)
      {
@@ -512,9 +512,10 @@ _native_free_cb(void *data, void *image)
 {
 }
 
-static void
+static void *
 eng_image_native_set(void *data, void *image, void *native)
 {
+   return NULL;
 }
 
 static void *