summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2015-02-25 22:13:07 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-02-26 11:02:38 +0900
commit70a7d9d2c5b3531bdde1294c55d038376da91918 (patch)
treea53e52c5477c432a3c321ee565e62d7cb38be9c3
parentcf14511b1decda11c335cadda83e132024088966 (diff)
downloadmpv-70a7d9d2c5b3531bdde1294c55d038376da91918.tar.bz2
mpv-70a7d9d2c5b3531bdde1294c55d038376da91918.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. (cherry picked from commit 8e80b3fd2fea8bf11abaeb108d85b2bdfbe14695)
-rw-r--r--waftools/checks/custom.py2
-rw-r--r--waftools/fragments/cocoa.m2
-rw-r--r--wscript2
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);
}
}
diff --git a/wscript b/wscript
index 8f3961cf97..846273dbf8 100644
--- a/wscript
+++ b/wscript
@@ -707,7 +707,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',