summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-07-20 12:16:37 +0200
committerJan Ekström <jeebjp@gmail.com>2019-07-21 18:13:07 +0300
commita8c2e2986838dccbcc4bd218b501f0bf86b36e2c (patch)
tree0f9ce3f16cc72c47dd70e9961e6c9b9f1cdabd43 /wscript
parent0602f082cb9775b4c9c8e256b1cb9de218a3b5fc (diff)
downloadmpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.bz2
mpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.xz
cocoa-cb: migrate to swift 5 with swift 4 fallback
this migrates our current swift code to version 5 and 4. building is support from 10.12.6 and xcode 9.1 onwards. dynamic linking is the new default, since Apple removed static libs from their new toolchains and it's the recommended way. additionally the found macOS SDK version is printed since it's an important information for finding possible errors now. Fixes #6470
Diffstat (limited to 'wscript')
-rw-r--r--wscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/wscript b/wscript
index 0670e50a66..925f8702be 100644
--- a/wscript
+++ b/wscript
@@ -129,7 +129,8 @@ build_options = [
'name': '--swift-static',
'desc': 'static Swift linking',
'deps': 'os-darwin',
- 'func': check_ctx_vars('SWIFT_LIB_STATIC')
+ 'func': check_ctx_vars('SWIFT_LIB_STATIC'),
+ 'default': 'disable'
}
]
@@ -958,7 +959,7 @@ standalone_features = [
}, {
'name': '--macos-cocoa-cb',
'desc': 'macOS opengl-cb backend',
- 'deps': 'cocoa && swift',
+ 'deps': 'cocoa && swift',
'func': check_true
}
]