captainigloo pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=15565fe7967c6beb3e7902c5ffcb5033ad8a58b7
commit 15565fe7967c6beb3e7902c5ffcb5033ad8a58b7
Author: Nicolas Aguirre <aguirre.nico...@gmail.com>
Date: Mon Aug 3 14:39:38 2015 +0200
Revert "Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs"
This reverts commit aff92d581ed052413aa36785a9291e47315eb518.
---
configure.ac | 1 +
src/lib/elm_win.c | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3b93e8e..41436b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ ELM_CHECK_BACKEND([Cocoa])
ELM_CHECK_BACKEND([Win32])
ELM_CHECK_BACKEND([Wayland])
ELM_CHECK_BACKEND([DRM])
+ELM_CHECK_BACKEND([EGLFS])
ELM_CHECK_OPTION([elocation], [0.1.0])
ELM_CHECK_OPTION([eweather], [0.2.0])
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 6c29818..1000f86 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3386,7 +3386,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
}
#endif
-#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB)
+#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB) ||
defined(HAVE_ELEMENTARY_EGLFS)
else if ((disp) && (!strcmp(disp, "fb")))
{
#ifdef HAVE_ELEMENTARY_DRM
@@ -3394,6 +3394,8 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#endif
#ifdef HAVE_ELEMENTARY_FB
enginelist[p++] = ELM_SOFTWARE_FB;
+#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
enginelist[p++] = ELM_EGLFS;
#endif
}
@@ -3455,7 +3457,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
- enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3480,6 +3481,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+ enginelist[p++] = ELM_EGLFS;
+#endif
}
else
{
@@ -3497,7 +3501,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
enginelist[p++] = ELM_DRM;
#endif
#ifdef HAVE_ELEMENTARY_FB
- enginelist[p++] = ELM_EGLFS;
enginelist[p++] = ELM_SOFTWARE_FB;
#endif
#ifdef HAVE_ELEMENTARY_COCOA
@@ -3525,6 +3528,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd,
const char *name, Elm_Win_
#ifdef HAVE_ELEMENTARY_PSL1GHT
enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+ enginelist[p++] = ELM_EGLFS;
+#endif
}
}
enginelist[p++] = NULL;
--
