From 98669ebdce48b454e5582242053a88fe5abcd766 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 3 Mar 2008 18:12:05 +0000
Subject: 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
---
 configure       | 2 ++
 loader/Makefile | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index a69f74e339..6b3b0ffe28 100755
--- a/configure
+++ b/configure
@@ -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 \
-- 
cgit v1.2.3