projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Support Ecore-Wayland2
[platform/core/uifw/dali-adaptor.git]
/
build
/
tizen
/
adaptor
/
configure.ac
diff --git
a/build/tizen/adaptor/configure.ac
b/build/tizen/adaptor/configure.ac
index
6cff84b
..
19ad826
100644
(file)
--- a/
build/tizen/adaptor/configure.ac
+++ b/
build/tizen/adaptor/configure.ac
@@
-180,6
+180,11
@@
AC_ARG_ENABLE(wayland,
enable_wayland=yes,
enable_wayland=no)
enable_wayland=yes,
enable_wayland=no)
+AC_ARG_ENABLE(ecore_wayland2,
+ [ --enable-ecore-wayland2 Build on Ecore Wayland2],
+ enable_ecore_wayland2=yes,
+ enable_ecore_wayland2=no)
+
AC_ARG_ENABLE([cxx03_abi],
[AC_HELP_STRING([--enable-cxx03-abi],
[Specify abi for the build])],
AC_ARG_ENABLE([cxx03_abi],
[AC_HELP_STRING([--enable-cxx03-abi],
[Specify abi for the build])],
@@
-201,6
+206,7
@@
AM_CONDITIONAL([TV_PROFILE], [test x$enable_profile = xTV])
AM_CONDITIONAL([IVI_PROFILE], [test x$enable_profile = xIVI])
AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU])
AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
AM_CONDITIONAL([IVI_PROFILE], [test x$enable_profile = xIVI])
AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU])
AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes])
+AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes])
AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes])
AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3])
AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes])
AM_CONDITIONAL([USE_APPFW_EFL_BASE], [test x$enable_tizen_major_version = x3])
AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
@@
-298,9
+304,12
@@
fi
# Using EFL api's for WAYLAND AND X11 to run on ecore mainloop
if test "x$enable_wayland" = "xyes"; then
# Using EFL api's for WAYLAND AND X11 to run on ecore mainloop
if test "x$enable_wayland" = "xyes"; then
-PKG_CHECK_MODULES(WAYLAND, [ecore-wayland egl wayland-egl wayland-client >= 1.2.0 xkbcommon libtbm],
- [DALI_USE_ECORE_WAYLAND=1],
- [DALI_USE_ECORE_WAYLAND=0])
+
+if test "x$enable_ecore_wayland2" = "xyes"; then
+PKG_CHECK_MODULES(WAYLAND, [ecore-wl2 egl wayland-egl wayland-client >= 1.2.0 xkbcommon libtbm])
+else
+PKG_CHECK_MODULES(WAYLAND, [ecore-wayland egl wayland-egl wayland-client >= 1.2.0 xkbcommon libtbm])
+fi
else
PKG_CHECK_MODULES(ECORE_X, [ecore-x],
else
PKG_CHECK_MODULES(ECORE_X, [ecore-x],
@@
-318,7
+327,6
@@
if test "x$enable_profile" != "xCOMMON"; then
PKG_CHECK_MODULES(WAYLAND_EXTENSION, xdg-shell-client text-client input-method-client)
fi
fi
PKG_CHECK_MODULES(WAYLAND_EXTENSION, xdg-shell-client text-client input-method-client)
fi
fi
-AM_CONDITIONAL([USE_ECORE_WAYLAND], [test "$DALI_USE_ECORE_WAYLAND" -eq 1])
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=$DALI_DATA_RW_DIR
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=$DALI_DATA_RW_DIR