summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2017-08-05 00:42:35 +0300
committerJan Ekström <jeebjp@gmail.com>2017-08-05 01:51:29 +0300
commit69650851f8963ed93326601d6b16869e994fcb34 (patch)
tree959361787c394443bd89ed59ada751985b0a4129 /wscript
parent037c7a92792837642626a120a90fb4ef74f7547e (diff)
downloadmpv-69650851f8963ed93326601d6b16869e994fcb34.tar.bz2
mpv-69650851f8963ed93326601d6b16869e994fcb34.tar.xz
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.
Diffstat (limited to 'wscript')
-rw-r--r--wscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/wscript b/wscript
index a66e6eeb89..cba839df14 100644
--- a/wscript
+++ b/wscript
@@ -137,6 +137,10 @@ main_dependencies = [
'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)'),
}, {
+ 'name': '--android',
+ 'desc': 'Android environment',
+ 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
+ }, {
'name': 'posix-or-mingw',
'desc': 'development environment',
'deps_any': [ 'posix', 'mingw' ],
@@ -708,10 +712,6 @@ video_output_features = [
'deps': [ 'win32-desktop' ],
'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',
'desc': 'Raspberry Pi support',
'func': check_rpi,