diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2015-02-25 22:13:07 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2015-02-25 22:13:07 +0100 |
| commit | 8e80b3fd2fea8bf11abaeb108d85b2bdfbe14695 (patch) | |
| tree | c9c22051ef2930f43d5bfcc4bf8c9b86d55e28cb | |
| parent | eb0db4d6fd58e2812b2464eb9c8b6317766e274f (diff) | |
| download | mpv-8e80b3fd2fea8bf11abaeb108d85b2bdfbe14695.tar.bz2 mpv-8e80b3fd2fea8bf11abaeb108d85b2bdfbe14695.tar.xz | |
build: move QuartzCore linking to the cocoa check
It's needed for the DisplayLink functions so it must be enabled for the basic
cocoa code.
| -rw-r--r-- | waftools/checks/custom.py | 2 | ||||
| -rw-r--r-- | waftools/fragments/cocoa.m | 2 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 97bcf9cc5c..d168d9e977 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -106,7 +106,7 @@ def check_cocoa(ctx, dependency_identifier): fn = check_cc( fragment = load_fragment('cocoa.m'), compile_filename = 'test.m', - framework_name = ['Cocoa', 'IOKit', 'OpenGL'], + framework_name = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'], includes = ctx.srcnode.abspath(), linkflags = '-fobjc-arc') diff --git a/waftools/fragments/cocoa.m b/waftools/fragments/cocoa.m index 8096afb613..3c6230401d 100644 --- a/waftools/fragments/cocoa.m +++ b/waftools/fragments/cocoa.m @@ -9,5 +9,7 @@ int main(int argc, char **argv) { NSArray *ary = @[@1, @2, @3]; NSLog(@"test subscripting: %@", ary[0]); NSApplicationLoad(); + CVDisplayLinkRef link; + CVDisplayLinkCreateWithCGDisplay(0, &link); } } @@ -712,7 +712,7 @@ hwaccel_features = [ 'deps': [ 'gl-cocoa', 'vda-hwaccel' ], # apparently a bug in waf causes msg= to be needed when passing only # framework= (it probably fails to infer it) - 'func': check_cc(msg='QuartzCore', framework='QuartzCore') + 'func': check_true }, { 'name': '--vdpau-hwaccel', 'desc': 'libavcodec VDPAU hwaccel', |