diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 17:51:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 17:51:36 +0000 |
| commit | e8347731663bbaa571129a14030114fd4ae49857 (patch) | |
| tree | 674f71a8825d2e8e4340dca97f048d71931a1336 | |
| parent | d47c6f5f3275bfb384d8e8eb932912960be28b12 (diff) | |
| download | mpv-e8347731663bbaa571129a14030114fd4ae49857.tar.bz2 mpv-e8347731663bbaa571129a14030114fd4ae49857.tar.xz | |
Move decision about whether or not to compile wrapper.S to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26148 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | loader/Makefile | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -6268,12 +6268,14 @@ echores "$_real" 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 @@ DVDCSS_INTERNAL = $_libdvdcss_internal DVDNAV = $_dvdnav WIN32DLL = $_win32dll QTX_CODECS = $_qtx +QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real XANIM_CODECS = $_xanim LIBAVUTIL = $_libavutil diff --git a/loader/Makefile b/loader/Makefile index 6d07e984ea..e3c71248a6 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -8,10 +8,7 @@ SRCS_COMMON = driver.c afl.c vfl.c 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 \ |