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

[diego]

Author: diego
Date: Mon Mar  3 19:12:05 2008
New Revision: 26149

Log:
Move decision about whether or not to compile Windows emulation
infrastructure to configure.


Modified:
   trunk/configure
   trunk/loader/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Mar  3 19:12:05 2008
@@ -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

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