Mercurial > mplayer.hg
changeset 26117:60496a1d9e98
Move decision about whether or not to compile Windows emulation
infrastructure to configure.
| author | diego |
|---|---|
| date | Mon, 03 Mar 2008 18:12:05 +0000 |
| parents | 5306b54354c4 |
| children | 468db9b6860c |
| files | configure loader/Makefile |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Mar 03 17:51:36 2008 +0000 +++ b/configure Mon Mar 03 18:12:05 2008 +0000 @@ -6209,6 +6209,7 @@ _res_comment="using $_win32codecsdir" if ! win32 ; then _def_win32_loader='#define WIN32_LOADER 1' + _win32_emulation=yes else _ld_extra="$_ld_extra -ladvapi32 -lole32" _res_comment="using native windows" @@ -7748,6 +7749,7 @@ DVDCSS_INTERNAL = $_libdvdcss_internal DVDNAV = $_dvdnav WIN32DLL = $_win32dll +WIN32_EMULATION = $_win32_emulation QTX_CODECS = $_qtx QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real
--- a/loader/Makefile Mon Mar 03 17:51:36 2008 +0000 +++ b/loader/Makefile Mon Mar 03 18:12:05 2008 +0000 @@ -5,11 +5,9 @@ #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT 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 \ +SRCS_COMMON-$(WIN32_EMULATION) += ldt_keeper.c pe_image.c module.c ext.c win32.c \ pe_resource.c resource.c registry.c elfdll.c SRCS_COMMON-$(QTX_EMULATION) += wrapper.S -endif SRCS_COMMON += dshow/DS_AudioDecoder.c \ dshow/DS_Filter.c \