diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 18:12:05 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-03 18:12:05 +0000 |
| commit | 98669ebdce48b454e5582242053a88fe5abcd766 (patch) | |
| tree | 0515bdaff95970627977909d51917e15960c651a | |
| parent | e8347731663bbaa571129a14030114fd4ae49857 (diff) | |
| download | mpv-98669ebdce48b454e5582242053a88fe5abcd766.tar.bz2 mpv-98669ebdce48b454e5582242053a88fe5abcd766.tar.xz | |
Move decision about whether or not to compile Windows emulation
infrastructure to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26149 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | loader/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -6209,6 +6209,7 @@ if test "$_win32dll" = yes ; then _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 @@ DVDREAD_INTERNAL = $_dvdread_internal DVDCSS_INTERNAL = $_libdvdcss_internal DVDNAV = $_dvdnav WIN32DLL = $_win32dll +WIN32_EMULATION = $_win32_emulation QTX_CODECS = $_qtx QTX_EMULATION = $_qtx_emulation REAL_CODECS = $_real diff --git a/loader/Makefile b/loader/Makefile index e3c71248a6..1ab373dc93 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -5,11 +5,9 @@ LIBNAME_COMMON = libloader.a #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 \ |