mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 03:52:22 +02:00
Code

wscript: split egl-android from android

Browse Source
This commit is contained in:
Tom Yan 2018-07-21 16:38:54 +08:00 committed by sfan5
parent d2d7dba6ee
commit d48786f682
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/options.c
View File

@ -740,7 +740,7 @@ const m_option_t mp_opts[] = {
OPT_SUBSTRUCT("", macos_opts, macos_conf, 0), OPT_SUBSTRUCT("", macos_opts, macos_conf, 0),
#endif #endif
#if HAVE_ANDROID #if HAVE_EGL_ANDROID
OPT_SUBSTRUCT("", android_opts, android_conf, 0), OPT_SUBSTRUCT("", android_opts, android_conf, 0),
#endif #endif

2
video/out/gpu/context.c
View File

@ -62,7 +62,7 @@ static const struct ra_ctx_fns *contexts[] = {
#endif #endif
// OpenGL contexts: // OpenGL contexts:
#if HAVE_ANDROID #if HAVE_EGL_ANDROID
&ra_ctx_android, &ra_ctx_android,
#endif #endif
#if HAVE_RPI #if HAVE_RPI

14
wscript
View File

@ -155,11 +155,13 @@ main_dependencies = [
}, { }, {
'name': '--android', 'name': '--android',
'desc': 'Android environment', 'desc': 'Android environment',
'func': compose_checks( 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header }, {
check_cc(lib="android"), 'name': '--egl-android',
check_cc(lib="EGL"), 'desc': 'Android EGL support',
) 'deps': 'android',
'groups': [ 'gl' ],
'func': check_cc(lib=['android', 'EGL']),
}, { }, {
'name': 'posix-or-mingw', 'name': 'posix-or-mingw',
'desc': 'development environment', 'desc': 'development environment',
@ -804,7 +806,7 @@ video_output_features = [
'name': 'egl-helpers', 'name': 'egl-helpers',
'desc': 'EGL helper functions', 'desc': 'EGL helper functions',
'deps': 'egl-x11 || mali-fbdev || rpi || gl-wayland || egl-drm || ' + 'deps': 'egl-x11 || mali-fbdev || rpi || gl-wayland || egl-drm || ' +
'egl-angle-win32 || android', 'egl-angle-win32 || egl-android',
'func': check_true 'func': check_true
} }
] ]

2
wscript_build.py
View File

@ -442,7 +442,7 @@ def build(ctx):
( "video/out/opengl/angle_dynamic.c", "egl-angle" ), ( "video/out/opengl/angle_dynamic.c", "egl-angle" ),
( "video/out/opengl/common.c", "gl" ), ( "video/out/opengl/common.c", "gl" ),
( "video/out/opengl/context.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_angle.c", "egl-angle-win32" ),
( "video/out/opengl/context_cocoa.c", "gl-cocoa" ), ( "video/out/opengl/context_cocoa.c", "gl-cocoa" ),
( "video/out/opengl/context_drm_egl.c", "egl-drm" ), ( "video/out/opengl/context_drm_egl.c", "egl-drm" ),