diff options
| author | wm4 <wm4@nowhere> | 2015-05-02 18:09:01 +0200 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-07 10:45:20 +0900 |
| commit | fe19db9cc08b96c813987e937bdc6f19a6d629f9 (patch) | |
| tree | 358cef5bf5fb99ca6e8961031a041ddfedcb0926 /player | |
| parent | 196e2d426cc5e89b074f983480f9304850b94ecc (diff) | |
| download | mpv-fe19db9cc08b96c813987e937bdc6f19a6d629f9.tar.bz2 mpv-fe19db9cc08b96c813987e937bdc6f19a6d629f9.tar.xz | |
cocoa: always compile OSX application code with cocoa
This unbreaks compiling command line player and libmpv at the same
time. The problem was that doing so silently disabled the OSX
application thing - but the command line player can not use the
vo_opengl Cocoa backend without it.
The OSX application code is basically dead in libmpv, but it's not
that much code anyway.
If you want a mpv binary that does not create an OSX application
singleton (and creates a menu etc.), you must disable cocoa
completely, as cocoa can't be used anyway in this case.
(cherry picked from commit 19a5b20752ecc7465cf17781f908e12bf4ca136d)
Diffstat (limited to 'player')
| -rw-r--r-- | player/main-fn-unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/main-fn-unix.c b/player/main-fn-unix.c index 23a047b4dc..87e1681987 100644 --- a/player/main-fn-unix.c +++ b/player/main-fn-unix.c @@ -1,13 +1,13 @@ #include "config.h" #include "core.h" -#if HAVE_COCOA_APPLICATION +#if HAVE_COCOA #include "osdep/macosx_application.h" #endif int main(int argc, char *argv[]) { -#if HAVE_COCOA_APPLICATION +#if HAVE_COCOA return cocoa_main(mpv_main, argc, argv); #else return mpv_main(argc, argv); |