[MPlayer-users] R26510 won't compile (loader/wine stuff)

[BUIRA Etienne]

On Fri, Apr 25, 2008 at 12:21:12PM +0300, Jan Knutar wrote:
> This solution works for me:
> 
> open Makefile, find the lines that say:
> 
> ifdef ARCH_X86
> PARTS += loader
> endif
> 
> Delete those 3 lines.
> Additionally, I also needed to modify mp3lib/Makefile
> 
> SRCS_COMMON                   += decode_i586.c
> 
> I deleted that line. This made mplayer build on amd64 for me.

Instead of deleting those lines, I adapted the conditionals. However, I
think that there was some win64 dll loading possible some time ago, so
the patch does break that.
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 26536)
+++ Makefile	(working copy)
@@ -566,7 +566,7 @@
         mp3lib \
         vidix \
 
-ifdef ARCH_X86
+ifdef ARCH_X86_32
 PARTS += loader
 endif
 
Index: mp3lib/Makefile
===================================================================
--- mp3lib/Makefile	(revision 26536)
+++ mp3lib/Makefile	(working copy)
@@ -5,7 +5,7 @@
 SRCS_COMMON = sr1.c
 SRCS_COMMON-$(HAVE_MMX)       += decode_mmx.c
 SRCS_COMMON-$(HAVE_SSE)       += dct64_sse.c
-SRCS_COMMON                   += decode_i586.c
+SRCS_COMMON-$(ARCH_X86_32)                   += decode_i586.c
 SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX)       += dct64_mmx.c
 SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW)     += dct36_3dnow.c dct64_3dnow.c
 SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX)   += dct36_k7.c dct64_k7.c