# HG changeset patch
# User diego
# Date 1209142711 0
# Node ID 94377468b14dca1d766a43040694aa5b691c66ec
# Parent  723f633b065e51a64b93691cf2d4586c30c5b2e2
Only add loader to parts if WIN32DLL is enabled.
Plus, some unrelated changes to mp3lib/Makefile committed by accident.

diff -r 723f633b065e -r 94377468b14d Makefile
--- a/Makefile	Fri Apr 25 16:54:24 2008 +0000
+++ b/Makefile	Fri Apr 25 16:58:31 2008 +0000
@@ -566,7 +566,7 @@
         mp3lib \
         vidix \
 
-ifdef ARCH_X86
+ifeq ($(WIN32DLL),yes)
 PARTS += loader
 endif
 
diff -r 723f633b065e -r 94377468b14d mp3lib/Makefile
--- a/mp3lib/Makefile	Fri Apr 25 16:54:24 2008 +0000
+++ b/mp3lib/Makefile	Fri Apr 25 16:58:31 2008 +0000
@@ -15,5 +15,5 @@
 
 decode_i586.o: CFLAGS += -fomit-frame-pointer
 
-%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH)
+%: %.c $(SRCS_COMMON:.c=.o) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH)
 	$(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm