diff options
| author | Tom Yan <tom.ty89@gmail.com> | 2018-07-21 16:38:54 +0800 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2018-08-20 17:16:22 +0200 |
| commit | d48786f68264ed23f8c3aa847e672a24d1cf4944 (patch) | |
| tree | 42e800ae808854a05f376c4448202b2fe4247556 | |
| parent | d2d7dba6ee3182174420c1d90caa20bf28ad7758 (diff) | |
| download | mpv-d48786f68264ed23f8c3aa847e672a24d1cf4944.tar.bz2 mpv-d48786f68264ed23f8c3aa847e672a24d1cf4944.tar.xz | |
wscript: split egl-android from android
| -rw-r--r-- | options/options.c | 2 | ||||
| -rw-r--r-- | video/out/gpu/context.c | 2 | ||||
| -rw-r--r-- | wscript | 14 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/options/options.c b/options/options.c index 1f9f1ee2c0..a98f03a7da 100644 --- a/options/options.c +++ b/options/options.c @@ -740,7 +740,7 @@ const m_option_t mp_opts[] = { OPT_SUBSTRUCT("", macos_opts, macos_conf, 0), #endif -#if HAVE_ANDROID +#if HAVE_EGL_ANDROID OPT_SUBSTRUCT("", android_opts, android_conf, 0), #endif diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c index 36f9c2dad5..7964e12623 100644 --- a/video/out/gpu/context.c +++ b/video/out/gpu/context.c @@ -62,7 +62,7 @@ static const struct ra_ctx_fns *contexts[] = { #endif // OpenGL contexts: -#if HAVE_ANDROID +#if HAVE_EGL_ANDROID &ra_ctx_android, #endif #if HAVE_RPI @@ -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 } ] diff --git a/wscript_build.py b/wscript_build.py index 4d974fd9c3..35b16856ea 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -442,7 +442,7 @@ def build(ctx): ( "video/out/opengl/angle_dynamic.c", "egl-angle" ), ( "video/out/opengl/common.c", "gl" ), ( "video/out/opengl/context.c", "gl" ), - ( "video/out/opengl/context_android.c", "android" ), + ( "video/out/opengl/context_android.c", "egl-android" ), ( "video/out/opengl/context_angle.c", "egl-angle-win32" ), ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ), ( "video/out/opengl/context_drm_egl.c", "egl-drm" ), |