From fe19db9cc08b96c813987e937bdc6f19a6d629f9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 May 2015 18:09:01 +0200 Subject: 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) --- osdep/macosx_application.h | 1 - 1 file changed, 1 deletion(-) (limited to 'osdep/macosx_application.h') diff --git a/osdep/macosx_application.h b/osdep/macosx_application.h index 8202093aed..c48d1154a0 100644 --- a/osdep/macosx_application.h +++ b/osdep/macosx_application.h @@ -32,6 +32,5 @@ typedef enum { // multithreaded wrapper for mpv_main int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[]); void cocoa_register_menu_item_action(MPMenuKey key, void* action); -void terminate_cocoa_application(void); #endif /* MPV_MACOSX_APPLICATION */ -- cgit v1.2.3