summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
-rw-r--r--loader/Makefile5
2 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index b4efe67200..a69f74e339 100755
--- a/configure
+++ b/configure
@@ -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 \