build: fix cocoa configure check on OS X 10.7
It failed because the 10.7 SDK doesn't natively support array and dictionary subscripting.
This commit is contained in:
1 parent
52fa38079d
commit
fb2d418327
3 files changed
+15
-6
No files matched your search
@@ -3,7 +3,8 @@ from waftools.checks.generic import *
|
||||
from waflib import Utils
|
||||
import os
|
||||
|
||||
__all__ = ["check_pthreads", "check_iconv", "check_lua", "check_oss_4front"]
|
||||
__all__ = ["check_pthreads", "check_iconv", "check_lua", "check_oss_4front",
|
||||
"check_cocoa"]
|
||||
|
||||
pthreads_program = load_fragment('pthreads.c')
|
||||
|
||||
@@ -101,3 +102,13 @@ def check_oss_4front(ctx, dependency_identifier):
|
||||
fragment=load_fragment('oss_audio.c'))
|
||||
|
||||
return fn(ctx, dependency_identifier)
|
||||
|
||||
def check_cocoa(ctx, dependency_identifier):
|
||||
fn = check_cc(
|
||||
fragment = load_fragment('cocoa.m'),
|
||||
compile_filename = 'test.m',
|
||||
framework_name = ['Cocoa', 'IOKit', 'OpenGL'],
|
||||
includes = ctx.srcnode.abspath(),
|
||||
linkflags = '-fobjc-arc')
|
||||
|
||||
return fn(ctx, dependency_identifier)
|
||||
@@ -2,6 +2,8 @@
|
||||
#import <OpenGL/OpenGL.h>
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
#include "osdep/macosx_compat.h"
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
@autoreleasepool {
|
||||
NSArray *ary = @[@1, @2, @3];
|
||||
|
||||
@@ -498,11 +498,7 @@ video_output_features = [
|
||||
{
|
||||
'name': '--cocoa',
|
||||
'desc': 'Cocoa',
|
||||
'func': check_cc(
|
||||
fragment=load_fragment('cocoa.m'),
|
||||
compile_filename='test.m',
|
||||
framework_name=['Cocoa', 'IOKit', 'OpenGL'],
|
||||
linkflags='-fobjc-arc')
|
||||
'func': check_cocoa
|
||||
} , {
|
||||
'name': 'gdi',
|
||||
'desc': 'GDI',
|
||||
|
||||
Reference in new issue
Block a user