forked from enlightenment/enlightenment
parent
15cb3316df
commit
9173deb1fc
22
configure.ac
22
configure.ac
|
@ -682,14 +682,6 @@ AC_SUBST(SHM_OPEN_LIBS)
|
|||
AC_SUBST([SOUND_CFLAGS])
|
||||
AC_SUBST([SOUND_LIBS])
|
||||
|
||||
have_wayland_egl=no
|
||||
AC_ARG_ENABLE([wayland-egl],
|
||||
AS_HELP_STRING([--enable-wayland-egl],[enable wayland to render using EGL @<:@default=disabled@:>@]),
|
||||
[e_cv_want_wayland_egl=$enableval],
|
||||
[e_cv_want_wayland_egl=no])
|
||||
AC_MSG_CHECKING([whether wayland EGL support is enabled])
|
||||
AC_MSG_RESULT([${e_cv_want_wayland_egl}])
|
||||
|
||||
if test "x${e_cv_want_wayland_only}" != "xno" ;then
|
||||
PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.7 wayland-scanner >= 1.11.0 xkbcommon uuid],
|
||||
[
|
||||
|
@ -710,21 +702,7 @@ else
|
|||
have_wayland=no
|
||||
fi
|
||||
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
if test "x${e_cv_want_wayland_egl}" != "xno";then
|
||||
PKG_CHECK_MODULES([WAYLAND_EGL], [egl >= 7.10],
|
||||
[
|
||||
have_wayland_egl=yes
|
||||
AC_DEFINE_UNQUOTED([HAVE_WAYLAND_EGL],[1],[enable wayland client EGL support])
|
||||
],
|
||||
[have_wayland_egl=no])
|
||||
else
|
||||
have_wayland_egl=no
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([HAVE_WAYLAND], [test "x${have_wayland}" = "xyes"])
|
||||
AM_CONDITIONAL([HAVE_WAYLAND_EGL], [test "x${have_wayland_egl}" = "xyes"])
|
||||
|
||||
if test "x${e_cv_want_wayland_only}" != "xyes"; then
|
||||
PKG_CHECK_MODULES([ECORE_X], [ecore-x >= ${efl_version}])
|
||||
|
|
|
@ -27,7 +27,6 @@ E_CPPFLAGS = \
|
|||
@VALGRIND_CFLAGS@ \
|
||||
@EDJE_DEF@ \
|
||||
@WAYLAND_CFLAGS@ \
|
||||
@WAYLAND_EGL_CFLAGS@ \
|
||||
-DE_BINDIR=\"$(bindir)\" \
|
||||
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
|
||||
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
|
||||
|
@ -469,7 +468,7 @@ src/bin/e_comp_wl_dmabuf.c: \
|
|||
|
||||
endif
|
||||
|
||||
src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@
|
||||
src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @ECORE_X_CFLAGS@
|
||||
src_bin_enlightenment_SOURCES = \
|
||||
src/bin/e_main.c \
|
||||
$(enlightenment_src)
|
||||
|
@ -477,7 +476,7 @@ $(enlightenment_src)
|
|||
nodist_src_bin_enlightenment_SOURCES = $(enlightenment_gen_src)
|
||||
|
||||
src_bin_enlightenment_LDFLAGS = -export-dynamic
|
||||
src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@
|
||||
src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@
|
||||
|
||||
src_bin_enlightenment_imc_SOURCES = \
|
||||
src/bin/e.h \
|
||||
|
|
|
@ -106,10 +106,6 @@ void *alloca (size_t);
|
|||
// XXX: FIXME: TMP solution for window stack until api is settled
|
||||
#define EFL_BETA_API_SUPPORT
|
||||
|
||||
/* egl.h must come before Evas_GL.h otherwise they will conflict */
|
||||
# ifdef HAVE_WAYLAND_EGL
|
||||
# include <EGL/egl.h>
|
||||
# endif
|
||||
|
||||
# include <setjmp.h>
|
||||
# include <Eo.h>
|
||||
|
|
|
@ -9,7 +9,6 @@ EFM_CPPFLAGS = \
|
|||
@VALGRIND_CFLAGS@ \
|
||||
@EDJE_DEF@ \
|
||||
@WAYLAND_CFLAGS@ \
|
||||
@WAYLAND_EGL_CFLAGS@ \
|
||||
-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
|
||||
-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
|
||||
-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
|
||||
|
|
|
@ -8,7 +8,6 @@ MOD_CPPFLAGS = -I. \
|
|||
-I$(top_srcdir)/src/modules \
|
||||
@e_cflags@ \
|
||||
@WAYLAND_CFLAGS@ \
|
||||
@WAYLAND_EGL_CFLAGS@ \
|
||||
-DE_BINDIR=\"$(bindir)\"
|
||||
|
||||
MOD_LIBS = @e_libs@ @dlopen_libs@
|
||||
|
|
Loading…
Reference in New Issue