Mercurial > mplayer.hg

comparison configure @ 29599:106374d8ceb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split QuickTime check off from quartz check and use the result to enable/disable the QTX codec support. This is necessary since 64 bit compiles on OS X 10.5 at least do not support QuickTime.
author reimar
date Fri, 04 Sep 2009 09:35:58 +0000
parents ab9cec67f2a9
children 8f25ecc08eb0
comparison
equal deleted inserted replaced
29598:8f54d278fd50 29599:106374d8ceb7
720 _qtx=auto 720 _qtx=auto
721 _maemo=auto 721 _maemo=auto
722 _coreaudio=auto 722 _coreaudio=auto
723 _corevideo=auto 723 _corevideo=auto
724 _quartz=auto 724 _quartz=auto
725 quicktime=auto
725 _macosx_finder=no 726 _macosx_finder=no
726 _macosx_bundle=auto 727 _macosx_bundle=auto
727 _sortsub=yes 728 _sortsub=yes
728 _freetypeconfig='freetype-config' 729 _freetypeconfig='freetype-config'
729 _fribidi=auto 730 _fribidi=auto
4762 fi 4763 fi
4763 4764
4764 4765
4765 if darwin; then 4766 if darwin; then
4766 4767
4768 echocheck "QuickTime"
4769 if test "$quicktime" = auto ; then
4770 cat > $TMPC <<EOF
4771 #include <QuickTime/QuickTime.h>
4772 int main(void) {
4773 ImageDescription *desc;
4774 EnterMovies();
4775 ExitMovies();
4776 return 0;
4777 }
4778 EOF
4779 quicktime=no
4780 cc_check -framework QuickTime && quicktime=yes
4781 fi
4782 if test "$quicktime" = yes ; then
4783 libs_mplayer="$libs_mplayer -framework QuickTime"
4784 def_quicktime='#define CONFIG_QUICKTIME 1'
4785 else
4786 def_quicktime='#undef CONFIG_QUICKTIME'
4787 _quartz=no
4788 fi
4789 echores $quicktime
4790
4767 echocheck "Quartz" 4791 echocheck "Quartz"
4768 if test "$_quartz" = auto ; then 4792 if test "$_quartz" = auto ; then
4769 cat > $TMPC <<EOF 4793 cat > $TMPC <<EOF
4770 #include <Carbon/Carbon.h> 4794 #include <Carbon/Carbon.h>
4771 #include <QuickTime/QuickTime.h>
4772 int main(void) { 4795 int main(void) {
4773 EnterMovies();
4774 ExitMovies();
4775 CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false); 4796 CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false);
4776 return 0; 4797 return 0;
4777 } 4798 }
4778 EOF 4799 EOF
4779 _quartz=no 4800 _quartz=no
4780 cc_check -framework Carbon -framework QuickTime && _quartz=yes 4801 cc_check -framework Carbon && _quartz=yes
4781 fi 4802 fi
4782 if test "$_quartz" = yes ; then 4803 if test "$_quartz" = yes ; then
4783 libs_mplayer="$libs_mplayer -framework Carbon -framework QuickTime" 4804 libs_mplayer="$libs_mplayer -framework Carbon"
4784 def_quartz='#define CONFIG_QUARTZ 1' 4805 def_quartz='#define CONFIG_QUARTZ 1'
4785 _vomodules="quartz $_vomodules" 4806 _vomodules="quartz $_vomodules"
4786 else 4807 else
4787 def_quartz='#undef CONFIG_QUARTZ' 4808 def_quartz='#undef CONFIG_QUARTZ'
4788 _novomodules="quartz $_novomodules" 4809 _novomodules="quartz $_novomodules"
6790 6811
6791 6812
6792 echocheck "QuickTime codecs" 6813 echocheck "QuickTime codecs"
6793 _qtx_emulation=no 6814 _qtx_emulation=no
6794 def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32' 6815 def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32'
6795 def_quicktime='#undef CONFIG_QUICKTIME'
6796 if test "$_qtx" = auto ; then 6816 if test "$_qtx" = auto ; then
6797 test "$_win32dll" = yes || darwin && _qtx=yes 6817 test "$_win32dll" = yes || quicktime && _qtx=yes
6798 fi 6818 fi
6799 if test "$_qtx" = yes ; then 6819 if test "$_qtx" = yes ; then
6800 darwin && extra_ldflags="$extra_ldflags -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1'
6801 def_qtx='#define CONFIG_QTX_CODECS 1' 6820 def_qtx='#define CONFIG_QTX_CODECS 1'
6802 win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1' 6821 win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
6803 _codecmodules="qtx $_codecmodules" 6822 _codecmodules="qtx $_codecmodules"
6804 darwin || win32 || _qtx_emulation=yes 6823 darwin || win32 || _qtx_emulation=yes
6805 else 6824 else