configure.ac / meson: depend on libnativewindow when appropriate
libnativewindow is only available on O or greater, and it's required for some features. Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
parent
bfed0a7099
commit
b070861045
13
configure.ac
13
configure.ac
|
@ -1574,6 +1574,12 @@ if test "x$enable_libglvnd" = xyes -a "x$EGL_LIB_SUFFIX" != x; then
|
||||||
AC_MSG_ERROR([EGL lib suffix can't be used with libglvnd])
|
AC_MSG_ERROR([EGL lib suffix can't be used with libglvnd])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_ARG_WITH([platform-sdk-version],
|
||||||
|
[AS_HELP_STRING([--with-platform-sdk-version@<:@=NAME@:>@],
|
||||||
|
[specify Android platform SDK version @<:@default=none@:>@])],
|
||||||
|
[platform_sdk_version=$withval],
|
||||||
|
[platform_sdk_version=""])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Mangled Mesa support
|
dnl Mangled Mesa support
|
||||||
dnl
|
dnl
|
||||||
|
@ -1908,7 +1914,12 @@ for plat in $platforms; do
|
||||||
;;
|
;;
|
||||||
|
|
||||||
android)
|
android)
|
||||||
PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
|
if test -n "$platform_sdk_version" && test "$platform_sdk_version" -ge 26; then
|
||||||
|
PKG_CHECK_MODULES([ANDROID], [cutils hardware nativewindow sync])
|
||||||
|
else
|
||||||
|
PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
|
||||||
|
fi
|
||||||
|
|
||||||
if test -n "$with_gallium_drivers"; then
|
if test -n "$with_gallium_drivers"; then
|
||||||
PKG_CHECK_MODULES([BACKTRACE], [backtrace])
|
PKG_CHECK_MODULES([BACKTRACE], [backtrace])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -726,6 +726,9 @@ if with_platform_android
|
||||||
dependency('hardware'),
|
dependency('hardware'),
|
||||||
dependency('sync'),
|
dependency('sync'),
|
||||||
]
|
]
|
||||||
|
if get_option('platform-sdk-version') >= 26
|
||||||
|
dep_android += dependency('nativewindow')
|
||||||
|
endif
|
||||||
pre_args += '-DHAVE_ANDROID_PLATFORM'
|
pre_args += '-DHAVE_ANDROID_PLATFORM'
|
||||||
endif
|
endif
|
||||||
if with_platform_haiku
|
if with_platform_haiku
|
||||||
|
|
|
@ -347,3 +347,11 @@ option(
|
||||||
value : '',
|
value : '',
|
||||||
description : 'Suffix to append to GLES library names. Default: none.'
|
description : 'Suffix to append to GLES library names. Default: none.'
|
||||||
)
|
)
|
||||||
|
option(
|
||||||
|
'platform-sdk-version',
|
||||||
|
type : 'integer',
|
||||||
|
min : 25,
|
||||||
|
max : 28,
|
||||||
|
value : 25,
|
||||||
|
description : 'Android Platform SDK version. Default: Nougat version.'
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue