diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:57:40 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:57:40 +0000 |
| commit | 5641e60698b0731ab163e331be07e121afd2358f (patch) | |
| tree | 6588630e090c19faf34daf1b50519175f6949749 | |
| parent | 091d352d065442817aa05c2f61910366004405be (diff) | |
| download | mpv-5641e60698b0731ab163e331be07e121afd2358f.tar.bz2 mpv-5641e60698b0731ab163e331be07e121afd2358f.tar.xz | |
Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libvo/vo_macosx.m | 2 | ||||
| -rw-r--r-- | libvo/vo_quartz.c | 2 | ||||
| -rw-r--r-- | parser-mpcmd.c | 4 |
4 files changed, 5 insertions, 5 deletions
@@ -371,7 +371,7 @@ SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c 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 \ diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index e980cfc456..e39bd7b3d0 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -326,7 +326,7 @@ static int preinit(const char *arg) 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); diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 2454600ddc..90593940cd 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -1141,7 +1141,7 @@ static int preinit(const char *arg) } } -#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 { diff --git a/parser-mpcmd.c b/parser-mpcmd.c index 8e5da2cb98..d9e735b8d1 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -74,7 +74,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) 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 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) 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; |