diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /Makefile | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
| download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 31 |
1 files changed, 14 insertions, 17 deletions
@@ -756,7 +756,7 @@ version.h: ./version.sh `$(CC) -dumpversion` osdep/mplayer-rc.o: osdep/mplayer.rc version.h - $(WINDRES) -I. -o $@ $< + $(WINDRES) -I. $< $@ @@ -777,11 +777,13 @@ loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer +vidix/%: CFLAGS += $(SVGALIB_CFLAGS) + VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ vidix/pci_names.h vidix/pci_vendors.h -$(VIDIX_PCI_FILES): vidix/pci.db - LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) +$(VIDIX_PCI_FILES): vidix/pci.db vidix/pci_db2c.awk + awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) @@ -901,7 +903,9 @@ TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/compare$(EXESUF) \ TOOLS/dump_mp4$(EXESUF) \ TOOLS/movinfo$(EXESUF) \ + TOOLS/netstream$(EXESUF) \ TOOLS/subrip$(EXESUF) \ + TOOLS/vivodump$(EXESUF) \ ifdef ARCH_X86 TOOLS += TOOLS/modify_reg$(EXESUF) @@ -910,8 +914,6 @@ endif ALLTOOLS = $(TOOLS) \ TOOLS/bmovl-test$(EXESUF) \ TOOLS/vfw2menc$(EXESUF) \ - TOOLS/vivodump$(EXESUF) \ - TOOLS/netstream$(EXESUF) \ tools: $(TOOLS) alltools: $(ALLTOOLS) @@ -927,8 +929,13 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 -#FIXME: Linking is broken, help welcome. -TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TEST_OBJS) +mplayer-nomain.o: mplayer.c + $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $< + +TOOLS/netstream$(EXESUF): TOOLS/netstream.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) +TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS) fastmemcpybench: TOOLS/fastmemcpybench.c $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX @@ -950,16 +957,6 @@ fastmemcpybench realcodecs: CFLAGS += -g %.so.6.0: %.o ld -shared -o $@ $< -ldl -lc -# FIXME: netstream linking is a mess that should be fixed properly some day. -# It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. -NETSTREAM_DEPS = libavutil/libavutil.a \ - m_option.o \ - m_struct.o \ - $(TEST_OBJS) - -TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) - $(CC) $(CFLAGS) -o $@ $^ - ###### drivers ####### |