diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-06-19 19:25:19 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-06-19 21:24:26 +0200 |
| commit | 0407869ae3aeea0d015b18bd8a901034ed45e76f (patch) | |
| tree | e5cc59f788329dff3783da64f92c24f475e93688 /osdep/macosx_events.m | |
| parent | a9f76c6d86d6fbbc91878995f0d3ff8d94690418 (diff) | |
| download | mpv-0407869ae3aeea0d015b18bd8a901034ed45e76f.tar.bz2 mpv-0407869ae3aeea0d015b18bd8a901034ed45e76f.tar.xz | |
OSX: fix compilation with 10.7 SDK
Recent work in the OS X parts of the code started using clang's support for
Obj-C's support for Literals and Subscripting. These particular language
features remove a lot of boilerplate code and allow to interact with
collections as consicely as one would do in scripting languages like Ruby or
Python.
Even if these are compiler features, Subscripting needs some runtime support.
This is provided with libarclite (coming with the compiler), but we need to
add the proper method definitions since the 10.7 SDK headers do not include
them. That is because 10.7 shipped before this language features.
This will cause some warnings when compiling with the 10.7 SDK because the
commit also redefines BOOL to make autoboxing/unboxing of BOOL literals to
work.
If you need to test this for whatever reason on 10.8, just pass in the correct
SDK to configure's extra cflags:
./configure --extra-cflags='-mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk'
Fixes #117
Diffstat (limited to 'osdep/macosx_events.m')
| -rw-r--r-- | osdep/macosx_events.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index ebeb260221..9a27f7049b 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -30,8 +30,10 @@ #include "core/mp_fifo.h" // doesn't make much sense, but needed to access keymap functionality #include "video/out/vo.h" -#include "osdep/macosx_events.h" + #import "osdep/macosx_application_objc.h" +#include "osdep/macosx_events.h" +#include "osdep/macosx_compat.h" #define NSLeftAlternateKeyMask (0x000020 | NSAlternateKeyMask) #define NSRightAlternateKeyMask (0x000040 | NSAlternateKeyMask) |