Mercurial > mplayer.hg
changeset 26116:5306b54354c4
Move decision about whether or not to compile wrapper.S to configure.
| author | diego |
|---|---|
| date | Mon, 03 Mar 2008 17:51:36 +0000 |
| parents | 3eedbd7321ea |
| children | 60496a1d9e98 |
| files | configure loader/Makefile |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Mar 03 17:50:25 2008 +0000 +++ b/configure Mon Mar 03 17:51:36 2008 +0000 @@ -6268,12 +6268,14 @@ echocheck "QuickTime codecs" +_qtx_emulation=no if test "$_qtx" = auto ; then test "$_win32dll" = yes || darwin && _qtx=yes fi if test "$_qtx" = yes ; then _def_qtx='#define USE_QTX_CODECS 1' _codecmodules="qtx $_codecmodules" + darwin || _qtx_emulation=yes else _def_qtx='#undef USE_QTX_CODECS' _nocodecmodules="qtx $_nocodecmodules" @@ -7747,6 +7749,7 @@ DVDNAV = $_dvdnav WIN32DLL = $_win32dll QTX_CODECS = $_qtx +QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real XANIM_CODECS = $_xanim LIBAVUTIL = $_libavutil
--- a/loader/Makefile Mon Mar 03 17:50:25 2008 +0000 +++ b/loader/Makefile Mon Mar 03 17:51:36 2008 +0000 @@ -8,10 +8,7 @@ ifneq ($(TARGET_WIN32),yes) SRCS_COMMON += ldt_keeper.c pe_image.c module.c ext.c win32.c \ pe_resource.c resource.c registry.c elfdll.c -# QTX emulation is not supported in Darwin -ifneq ($(TARGET_OS),Darwin) -SRCS_COMMON += wrapper.S -endif +SRCS_COMMON-$(QTX_EMULATION) += wrapper.S endif SRCS_COMMON += dshow/DS_AudioDecoder.c \