diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-12 18:38:02 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-13 22:04:47 +0200 |
| commit | 0f1a871d65f74ab250d3fb07d6d8062a3bfa1e89 (patch) | |
| tree | 934b13fa5a4057af954063a7915c0e2df1260545 | |
| parent | 2e5610c23a1f43856d9554d7821c2f2ae0fe91f2 (diff) | |
| download | mpv-0f1a871d65f74ab250d3fb07d6d8062a3bfa1e89.tar.bz2 mpv-0f1a871d65f74ab250d3fb07d6d8062a3bfa1e89.tar.xz | |
macosx: always active bundle path lookup if cocoa is active
This is not really something you want to disable anyway. If there is no bundle
the code already does it's falbacks anyway.
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | mpvcore/path.c | 4 |
3 files changed, 3 insertions, 21 deletions
@@ -44,8 +44,8 @@ SOURCES-$(LIBBS2B) += audio/filter/af_bs2b.c SOURCES-$(LIBPOSTPROC) += video/filter/vf_pp.c SOURCES-$(LIBSMBCLIENT) += stream/stream_smb.c -SOURCES-$(MACOSX_BUNDLE) += osdep/macosx_bundle.m SOURCES-$(COCOA) += video/out/cocoa_common.m \ + osdep/macosx_bundle.m \ osdep/macosx_application.m \ osdep/macosx_events.m \ osdep/ar/HIDRemote.m @@ -316,7 +316,6 @@ Optional features: --disable-bluray disable Blu-ray support [autodetect] --disable-dvdread disable libdvdread [autodetect] --disable-enca disable ENCA charset oracle library [autodetect] - --enable-macosx-bundle enable Mac OS X bundle file locations [disabled] --disable-pthreads disable Posix threads support [autodetect] --disable-libass disable subtitle rendering with libass [autodetect] --disable-libass-osd disable OSD rendering with libass [autodetect] @@ -474,7 +473,6 @@ _cdda=auto _coreaudio=auto _corevideo=auto _cocoa=auto -_macosx_bundle=no _enca=auto _pthreads=auto _ass=auto @@ -708,7 +706,6 @@ for ac_option do --disable-corevideo) _corevideo=no ;; --enable-cocoa) _cocoa=yes ;; --disable-cocoa) _cocoa=no ;; - --enable-macosx-bundle) _macosx_bundle=yes ;; --enable-manpage) _build_man=yes ;; --disable-manpage) _build_man=no ;; @@ -1546,19 +1543,6 @@ fi echores "$_sys_sysinfo" -if darwin; then - -echocheck "Mac OS X Bundle file locations" -if test "$_macosx_bundle" = yes ; then - extra_ldflags="$extra_ldflags -headerpad_max_install_names" - def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' -else - def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE' -fi -echores "$_macosx_bundle" - -fi #if darwin - echocheck "pkg-config" if $($_pkg_config --version > /dev/null 2>&1); then if test "$_ld_static"; then @@ -3078,7 +3062,6 @@ LIBQUVI = $_libquvi4 LIBQUVI9 = $_libquvi9 LIBGUESS = $_libguess LIRC = $_lirc -MACOSX_BUNDLE = $_macosx_bundle MNG = $_mng MPG123 = $_mpg123 OPENAL = $_openal @@ -3164,7 +3147,6 @@ $def_termios $def_dl $def_dos_paths $def_iconv -$def_macosx_bundle $def_priority diff --git a/mpvcore/path.c b/mpvcore/path.c index b7ea7e768c..68051b701d 100644 --- a/mpvcore/path.c +++ b/mpvcore/path.c @@ -46,7 +46,7 @@ #include <sys/cygwin.h> #endif -#ifdef CONFIG_MACOSX_BUNDLE +#ifdef CONFIG_COCOA #include "osdep/macosx_bundle.h" #endif @@ -54,7 +54,7 @@ typedef char *(*lookup_fun)(const char *); static const lookup_fun config_lookup_functions[] = { mp_find_user_config_file, -#ifdef CONFIG_MACOSX_BUNDLE +#ifdef CONFIG_COCOA get_bundled_path, #endif mp_find_global_config_file, |