From 69650851f8963ed93326601d6b16869e994fcb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Sat, 5 Aug 2017 00:42:35 +0300 Subject: 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. --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index a66e6eeb89..cba839df14 100644 --- a/wscript +++ b/wscript @@ -136,6 +136,10 @@ main_dependencies = [ # This should be good enough. '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', @@ -707,10 +711,6 @@ video_output_features = [ 'desc': 'Direct3D support', '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', -- cgit v1.2.3