fix loader build on windows

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12681 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 10 insertions, 9 deletions

diff --git a/configure b/configure
index f140ded3a3..fbad2032e2 100755
--- a/configure
+++ b/configure
@@ -5011,20 +5011,17 @@ fi
 if test "$_win32" != no ; then
   _def_win32_loader='#undef WIN32_LOADER'
   echocheck "Win32 loader support"
+  _ld_win32='loader/libloader.a'
+  _dep_win32='loader/libloader.a'
+  _codecmodules="win32 $_codecmodules"
+  if openbsd ; then
+    x86 && _ld_win32="$_ld_win32 -li386"
+  fi
   if not win32 ; then
-    _ld_win32='loader/libloader.a'
-    _dep_win32='loader/libloader.a'
-    _codecmodules="win32 $_codecmodules"
-    if openbsd ; then
-      x86 && _ld_win32="$_ld_win32 -li386"
-    fi
     _def_win32_loader='#define WIN32_LOADER 1'
     echores "yes"
   else
-    _ld_win32='loader/driver.o loader/vfl.o loader/afl.o'
-    _dep_win32='loader/driver.o loader/vfl.o loader/afl.o'
     _ld_win32libs="$_ld_win32libs -ladvapi32 -lole32"
-    _codecmodules="win32 $_codecmodules"
     echores "no (using native windows)"
   fi
 fi
diff --git a/loader/Makefile b/loader/Makefile
index 1947d1f451..9a69e3a4f1 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -4,9 +4,13 @@ include ../config.mak
 DEFINES=-DMPLAYER -D__WINE__ #-Ddbg_printf=__vprintf \
 	#-DTRACE=__vprintf # -DDETAILED_OUT
 
+ifeq ($(TARGET_WIN32),yes)
+LIB_OBJECTS= driver.o afl.o vfl.o
+else
 LIB_OBJECTS= ldt_keeper.o pe_image.o module.o \
 ext.o win32.o driver.o pe_resource.o \
 resource.o registry.o elfdll.o afl.o vfl.o wrapper.o
+endif
 
 # gcc-3.0 produces buggy code for acmStreamOpen() with
 # "-O3 -fomit-frame-pointer" or "-O2 -fomit-frame-pointer