forked from enlightenment/efl
Patch from Jérémy Zurcher <jeremy@asynk.ch> to fix ecore_evas_wayland
compilation checks. Signed-off-by: Christopher Michael <cp.michael@samsung.com> SVN revision: 80140
This commit is contained in:
parent
fe075cbae9
commit
313ad7e69b
15
configure.ac
15
configure.ac
|
@ -2983,9 +2983,16 @@ AC_MSG_NOTICE([Ecore_Wayland checks])
|
||||||
|
|
||||||
### Checks for libraries
|
### Checks for libraries
|
||||||
|
|
||||||
## Evil, Eina, Ecore, Ecore_Input
|
# Evil library for compilation on Windows
|
||||||
|
case "$host_os" in
|
||||||
|
mingw*)
|
||||||
|
requirements_pc_ecore_wayland="evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_con}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
requirements_pc_ecore_wayland="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} evil >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wayland}"
|
## Eina, Ecore, Ecore_Input
|
||||||
|
|
||||||
|
requirements_pc_ecore_wayland="ecore-input >= ${PACKAGE_VERSION} ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_ecore_wayland}"
|
||||||
|
|
||||||
## Wayland
|
## Wayland
|
||||||
|
|
||||||
|
@ -3916,14 +3923,14 @@ ECORE_EVAS_CHECK_MODULE_FULL([opengl-sdl],
|
||||||
# ecore_evas_wayland
|
# ecore_evas_wayland
|
||||||
|
|
||||||
ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm],
|
ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm],
|
||||||
[wayland-shm],
|
[${have_evas_engine_wayland_shm}],
|
||||||
[${want_ecore_evas_wayland_shm}],
|
[${want_ecore_evas_wayland_shm}],
|
||||||
[Wayland Shm],
|
[Wayland Shm],
|
||||||
[${have_ecore_wayland}],
|
[${have_ecore_wayland}],
|
||||||
[requirements_pc_ecore_evas="ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
|
[requirements_pc_ecore_evas="ecore-wayland >= ${PACKAGE_VERSION} ${requirements_pc_ecore_evas}"])
|
||||||
|
|
||||||
ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl],
|
ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl],
|
||||||
[wayland-egl egl >= 7.10],
|
[${have_evas_engine_wayland_egl}],
|
||||||
[${want_ecore_evas_wayland_egl}],
|
[${want_ecore_evas_wayland_egl}],
|
||||||
[Wayland Egl],
|
[Wayland Egl],
|
||||||
[${have_ecore_wayland}],
|
[${have_ecore_wayland}],
|
||||||
|
|
|
@ -31,7 +31,7 @@ lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
|
||||||
@ECORE_WAYLAND_CFLAGS@
|
@ECORE_WAYLAND_CFLAGS@
|
||||||
|
|
||||||
lib_ecore_wayland_libecore_wayland_la_LIBADD = \
|
lib_ecore_wayland_libecore_wayland_la_LIBADD = \
|
||||||
lib/ecore/libecore_input.la \
|
lib/ecore_input/libecore_input.la \
|
||||||
lib/ecore/libecore.la \
|
lib/ecore/libecore.la \
|
||||||
lib/eo/libeo.la \
|
lib/eo/libeo.la \
|
||||||
lib/eina/libeina.la \
|
lib/eina/libeina.la \
|
||||||
|
|
Loading…
Reference in New Issue