[MPlayer-cvslog] r26539 - in trunk: Makefile mp3lib/Makefile

[diego]

Author: diego
Date: Fri Apr 25 18:58:31 2008
New Revision: 26539

Log:
Only add loader to parts if WIN32DLL is enabled.


Modified:
   trunk/Makefile
   trunk/mp3lib/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Apr 25 18:58:31 2008
@@ -566,7 +566,7 @@ PARTS = liba52 \
         mp3lib \
         vidix \
 
-ifdef ARCH_X86
+ifeq ($(WIN32DLL),yes)
 PARTS += loader
 endif
 

Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Fri Apr 25 18:58:31 2008
@@ -15,5 +15,5 @@ include ../mpcommon.mak
 
 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