changeset 26507:94377468b14d

Only add loader to parts if WIN32DLL is enabled. Plus, some unrelated changes to mp3lib/Makefile committed by accident.
author diego
date Fri, 25 Apr 2008 16:58:31 +0000
parents 723f633b065e
children 0f2b5a7df436
files Makefile mp3lib/Makefile
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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