RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

build: move Android environment check to main dependencies 

Additionally change the description to better match what Android is,
which is an "environment". The original positioning of this check
was unfortunate.
This commit is contained in:
Jan Ekström 2017-08-05 00:42:35 +03:00
parent 037c7a9279
commit 69650851f8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@ -136,6 +136,10 @@ main_dependencies = [
# This should be good enough. # This should be good enough.
'func': check_statement(['poll.h', 'unistd.h', 'sys/mman.h'], 'func': check_statement(['poll.h', 'unistd.h', 'sys/mman.h'],
'struct pollfd pfd; poll(&pfd, 1, 0); fork(); int f[2]; pipe(f); munmap(f,0)'), 'struct pollfd pfd; poll(&pfd, 1, 0); fork(); int f[2]; pipe(f); munmap(f,0)'),
}, {
'name': '--android',
'desc': 'Android environment',
'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
}, { }, {
'name': 'posix-or-mingw', 'name': 'posix-or-mingw',
'desc': 'development environment', 'desc': 'development environment',
@ -707,10 +711,6 @@ video_output_features = [
'desc': 'Direct3D support', 'desc': 'Direct3D support',
'deps': [ 'win32-desktop' ], 'deps': [ 'win32-desktop' ],
'func': check_cc(header_name='d3d9.h'), 'func': check_cc(header_name='d3d9.h'),
}, {
'name': '--android',
'desc': 'Android support',
'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
}, { }, {
'name': '--rpi', 'name': '--rpi',
'desc': 'Raspberry Pi support', 'desc': 'Raspberry Pi support',