Mercurial > mplayer.hg
annotate TOOLS/Makefile @ 25509:1cfa39a320cc
Fix update_subtitles() checking subtitle type for the wrong track.
update_subtitles() uses 'type' field from d_dvdsub even when some other track
is active. For this reason, external vobsub is not displayed when there is at
least one text track from demuxer (type is always 't' or 'a' in this case).
The solution is to check vobsub_id and dvdsub_id instead.
author | eugeni |
---|---|
date | Fri, 28 Dec 2007 20:57:38 +0000 |
parents | 3e2fc119e4f4 |
children | 20e00af8f426 |
rev | line source |
---|---|
13574
ae638e3c2808
Make Makefile conform to the general MPlayer style, alaw-gen added.
diego
parents:
12962
diff
changeset
|
1 include ../config.mak |
ae638e3c2808
Make Makefile conform to the general MPlayer style, alaw-gen added.
diego
parents:
12962
diff
changeset
|
2 |
ae638e3c2808
Make Makefile conform to the general MPlayer style, alaw-gen added.
diego
parents:
12962
diff
changeset
|
3 CFLAGS = -I.. |
ae638e3c2808
Make Makefile conform to the general MPlayer style, alaw-gen added.
diego
parents:
12962
diff
changeset
|
4 |
20755
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
5 OBJS = alaw-gen$(EXESUF) \ |
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
6 asfinfo$(EXESUF) \ |
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
7 avi-fix$(EXESUF) \ |
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
8 avisubdump$(EXESUF) \ |
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
9 dump_mp4$(EXESUF) \ |
23996 | 10 modify_reg$(EXESUF) \ |
20755
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
11 movinfo$(EXESUF) \ |
b4c865e17155
Create binaries with proper executable suffix under Windows.
diego
parents:
19271
diff
changeset
|
12 subrip$(EXESUF) \ |
22629 | 13 # vivodump$(EXESUF) \ |
12962 | 14 |
24223 | 15 COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm |
16 | |
12962 | 17 all: $(OBJS) |
18 | |
22745 | 19 subrip$(EXESUF): subrip.c |
24224 | 20 $(CC) $(CFLAGS) -o $@ $< ../vobsub.o ../spudec.o \ |
22628
0334e714d3fa
Fix linking: libswscale depends on libavutil, verbose was multiply defined...
diego
parents:
21196
diff
changeset
|
21 ../unrarlib.o ../libswscale/libswscale.a ../libavutil/libavutil.a \ |
24223 | 22 ../libmpcodecs/img_format.o $(COMMON_LIBS) |
12962 | 23 |
22629 | 24 #FIXME: Linking is broken, help welcome. |
22745 | 25 vivodump$(EXESUF): vivodump.c |
24223 | 26 $(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a \ |
27 ../stream/stream.a $(COMMON_LIBS) | |
12962 | 28 |
24212 | 29 fastmemcpybench: fastmemcpybench.c |
24224 | 30 $(CC) $(CFLAGS) $< -o fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX |
31 $(CC) $(CFLAGS) $< -o fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW | |
32 $(CC) $(CFLAGS) $< -o fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 | |
33 $(CC) $(CFLAGS) $< -o fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 | |
34 $(CC) $(CFLAGS) $< -o fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DHAVE_MGA -DHAVE_MMX | |
35 $(CC) $(CFLAGS) $< -o fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW | |
36 $(CC) $(CFLAGS) $< -o fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 | |
37 $(CC) $(CFLAGS) $< -o fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 | |
12962 | 38 |
22737
6ce48e36dc01
Move gltest and bmovl-test into the main TOOLS directory, subdirectories
diego
parents:
22629
diff
changeset
|
39 bmovl-test$(EXESUF): bmovl-test.c |
24209 | 40 $(CC) $(CFLAGS) -o $@ $< -lSDL_image |
22737
6ce48e36dc01
Move gltest and bmovl-test into the main TOOLS directory, subdirectories
diego
parents:
22629
diff
changeset
|
41 |
22743 | 42 vfw2menc$(EXESUF): vfw2menc.c |
43 $(CC) $< -o $@ -lwinmm -lole32 | |
44 | |
22806
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
45 REAL_SRCS = $(wildcard realcodecs/*.c) |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
46 REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0) |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
47 |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
48 realcodecs: $(REAL_TARGETS) |
24224 | 49 |
50 subrip fastmemcpybench realcodecs: CFLAGS += -g | |
22806
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
51 |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
52 %.so.6.0: %.o |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
53 ld -shared -o $@ $< -ldl -lc |
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
54 |
22855
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
55 # FIXME: netstream linking is a mess that should be fixed properly some day. |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
56 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
57 NETSTREAM_DEPS = ../libmpdemux/libmpdemux.a \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
58 ../stream/stream.a \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
59 ../dvdread/libdvdread.a \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
60 ../libdvdcss/libdvdcss.a \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
61 ../libavutil/libavutil.a \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
62 ../m_option.o \ |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
63 ../m_struct.o \ |
24223 | 64 $(COMMON_LIBS) |
22855
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
65 |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
66 ifeq ($(TARGET_WIN32),yes) |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
67 NETSTREAM_DEPS += -lwsock32 |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
68 endif |
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
69 |
22856
27db9ffe00a5
Ignore netstream and fix its compilation; remove object files on make clean.
diego
parents:
22855
diff
changeset
|
70 netstream: netstream.o $(NETSTREAM_DEPS) |
27db9ffe00a5
Ignore netstream and fix its compilation; remove object files on make clean.
diego
parents:
22855
diff
changeset
|
71 $(CC) -o $@ $^ |
22855
d258dd05e0ab
Move netstream.c out of its single-file subdirectory.
diego
parents:
22846
diff
changeset
|
72 |
21196
9725193f1530
Add distclean target, unconditionally remove all objects on clean.
diego
parents:
20755
diff
changeset
|
73 clean distclean: |
22856
27db9ffe00a5
Ignore netstream and fix its compilation; remove object files on make clean.
diego
parents:
22855
diff
changeset
|
74 rm -f *.o *~ $(OBJS) |
27db9ffe00a5
Ignore netstream and fix its compilation; remove object files on make clean.
diego
parents:
22855
diff
changeset
|
75 rm -f fastmem-* fastmem2-* fastmemcpybench netstream |
22932 | 76 rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF) |
22806
5908689f34de
Use the top-level TOOLS Makefile to build the Real codecs wrappers.
diego
parents:
22778
diff
changeset
|
77 rm -f $(REAL_TARGETS) |
24207 | 78 |
79 .PHONY: all fastmemcpybench realcodecs clean distclean |