Mercurial > mplayer.hg
changeset 27394:a0c602e0caf3
Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
| author | diego |
|---|---|
| date | Thu, 07 Aug 2008 10:57:40 +0000 |
| parents | 4876c89bafdd |
| children | 587716f0b4cc |
| files | Makefile libvo/vo_macosx.m libvo/vo_quartz.c parser-mpcmd.c |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Aug 07 10:36:07 2008 +0000 +++ b/Makefile Thu Aug 07 10:57:40 2008 +0000 @@ -371,7 +371,7 @@ SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ libmpdemux/demux_ogg.c -SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c +SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \
--- a/libvo/vo_macosx.m Thu Aug 07 10:36:07 2008 +0000 +++ b/libvo/vo_macosx.m Thu Aug 07 10:57:40 2008 +0000 @@ -326,7 +326,7 @@ if(!shared_buffer) { - #if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL) + #if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL) //this chunk of code is heavily based off SDL_macosx.m from SDL //it uses an Apple private function to request foreground operation void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
--- a/libvo/vo_quartz.c Thu Aug 07 10:36:07 2008 +0000 +++ b/libvo/vo_quartz.c Thu Aug 07 10:57:40 2008 +0000 @@ -1141,7 +1141,7 @@ } } -#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL) +#if !defined (MACOSX_FINDER) || !defined (CONFIG_SDL) //this chunk of code is heavily based off SDL_macosx.m from SDL //it uses an Apple private function to request foreground operation {
--- a/parser-mpcmd.c Thu Aug 07 10:36:07 2008 +0000 +++ b/parser-mpcmd.c Thu Aug 07 10:57:40 2008 +0000 @@ -74,7 +74,7 @@ int no_more_opts = 0; int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything play_tree_t *last_parent, *last_entry = NULL, *root; -#ifdef MACOSX_FINDER_SUPPORT +#ifdef MACOSX_FINDER extern play_tree_t *macosx_finder_args(m_config_t *, int , char **); #endif @@ -86,7 +86,7 @@ config->mode = M_COMMAND_LINE; mode = GLOBAL; -#ifdef MACOSX_FINDER_SUPPORT +#ifdef MACOSX_FINDER root=macosx_finder_args(config, argc, argv); if(root) return root;