[MPlayer-cvslog] r26148 - in trunk: configure loader/Makefile

[diego]

Author: diego
Date: Mon Mar  3 18:51:36 2008
New Revision: 26148

Log:
Move decision about whether or not to compile wrapper.S to configure.


Modified:
   trunk/configure
   trunk/loader/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Mar  3 18:51:36 2008
@@ -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

Modified: trunk/loader/Makefile
==============================================================================
--- trunk/loader/Makefile	(original)
+++ trunk/loader/Makefile	Mon Mar  3 18:51:36 2008
@@ -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 \