summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorTom Yan <tom.ty89@gmail.com>2018-07-21 16:38:54 +0800
committersfan5 <sfan5@live.de>2018-08-20 17:16:22 +0200
commitd48786f68264ed23f8c3aa847e672a24d1cf4944 (patch)
tree42e800ae808854a05f376c4448202b2fe4247556 /wscript
parentd2d7dba6ee3182174420c1d90caa20bf28ad7758 (diff)
downloadmpv-d48786f68264ed23f8c3aa847e672a24d1cf4944.tar.bz2
mpv-d48786f68264ed23f8c3aa847e672a24d1cf4944.tar.xz
wscript: split egl-android from android
Diffstat (limited to 'wscript')
-rw-r--r--wscript14
1 files changed, 8 insertions, 6 deletions
diff --git a/wscript b/wscript
index e0dbeab322..eaeb091a52 100644
--- a/wscript
+++ b/wscript
@@ -155,11 +155,13 @@ main_dependencies = [
}, {
'name': '--android',
'desc': 'Android environment',
- 'func': compose_checks(
- check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
- check_cc(lib="android"),
- check_cc(lib="EGL"),
- )
+ 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
+ }, {
+ 'name': '--egl-android',
+ 'desc': 'Android EGL support',
+ 'deps': 'android',
+ 'groups': [ 'gl' ],
+ 'func': check_cc(lib=['android', 'EGL']),
}, {
'name': 'posix-or-mingw',
'desc': 'development environment',
@@ -804,7 +806,7 @@ video_output_features = [
'name': 'egl-helpers',
'desc': 'EGL helper functions',
'deps': 'egl-x11 || mali-fbdev || rpi || gl-wayland || egl-drm || ' +
- 'egl-angle-win32 || android',
+ 'egl-angle-win32 || egl-android',
'func': check_true
}
]