diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-25 16:58:31 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-25 16:58:31 +0000 |
commit | ffed0ab3d265bf13e67fc77e1b5abf153e652508 (patch) | |
tree | 4c3cce05877e0eecaa4c423e304fba2d91af6fea | |
parent | 1a35efe7f7373bfdf966722afe5bc7562e94adf7 (diff) | |
download | mpv-ffed0ab3d265bf13e67fc77e1b5abf153e652508.tar.bz2 mpv-ffed0ab3d265bf13e67fc77e1b5abf153e652508.tar.xz |
Only add loader to parts if WIN32DLL is enabled.
Plus, some unrelated changes to mp3lib/Makefile committed by accident.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | mp3lib/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -566,7 +566,7 @@ PARTS = liba52 \ mp3lib \ vidix \ -ifdef ARCH_X86 +ifeq ($(WIN32DLL),yes) PARTS += loader endif diff --git a/mp3lib/Makefile b/mp3lib/Makefile index f8eb6aa1be..7d4ef33ff1 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -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 |