diff options
author | Akemi <der.richter@gmx.de> | 2018-07-08 17:05:13 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-09-30 16:54:03 +0300 |
commit | 5c2056ad0a43b1d15baef6d289aff8cacadad053 (patch) | |
tree | f6ed3e886a7b4ca7a45ed665c6b4ba9d77c8325e | |
parent | 50787acb275dc0465a0cf7234ee8f9bd07f0d4d1 (diff) | |
download | mpv-5c2056ad0a43b1d15baef6d289aff8cacadad053.tar.bz2 mpv-5c2056ad0a43b1d15baef6d289aff8cacadad053.tar.xz |
add swift as main dependency so all dependencies can be disabled easily
-rw-r--r-- | waftools/checks/custom.py | 2 | ||||
-rw-r--r-- | wscript | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 1cb133f27c..821bf9c46f 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -115,6 +115,8 @@ def check_cocoa(ctx, dependency_identifier): def check_swift(ctx, dependency_identifier): if ctx.env.SWIFT_VERSION: major = int(ctx.env.SWIFT_VERSION.split('.')[0]) + ctx.add_optional_message(dependency_identifier, + 'version found: ' + ctx.env.SWIFT_VERSION) if major >= 3: return True return False @@ -171,6 +171,11 @@ main_dependencies = [ 'fmsg': 'Unable to find either POSIX or MinGW-w64 environment, ' \ 'or compiler does not work.', }, { + 'name': '--swift', + 'desc': 'macOS Swift build tools', + 'deps': 'os-darwin', + 'func': check_swift, + }, { 'name': '--uwp', 'desc': 'Universal Windows Platform', 'default': 'disable', @@ -914,8 +919,8 @@ standalone_features = [ }, { 'name': '--macos-cocoa-cb', 'desc': 'macOS opengl-cb backend', - 'deps': 'cocoa', - 'func': check_swift + 'deps': 'cocoa && swift', + 'func': check_true } ] |