Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 7 Aug 2008 10:57:40 +0000 (10:57 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 7 Aug 2008 10:57:40 +0000 (10:57 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile
libvo/vo_macosx.m
libvo/vo_quartz.c
parser-mpcmd.c

index d6471c8..496dc32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 \
index e980cfc..e39bd7b 100644 (file)
@@ -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);
index 2454600..9059394 100644 (file)
@@ -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
 {
index 8e5da2c..d9e735b 100644 (file)
@@ -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;