diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-29 18:20:59 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-29 18:20:59 +0000 |
| commit | 7b646186099ab9b4a8b685dab5a0e663c34d7bc3 (patch) | |
| tree | d2acc735115fd4d7173dff50881d3b0802b0fc98 /Makefile | |
| parent | 4c9621ece7c7a5bd2da22ffbf64fcd730775275d (diff) | |
| download | mpv-7b646186099ab9b4a8b685dab5a0e663c34d7bc3.tar.bz2 mpv-7b646186099ab9b4a8b685dab5a0e663c34d7bc3.tar.xz | |
Reinvent Nexus last fix (wrong local merger on last commit)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3205 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -146,7 +146,7 @@ MENCODER_DEP += Gui/libgui.a endif $(PRG): $(MPLAYER_DEP) - $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(AV_LIB) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) + $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(PRG_FIBMAP): fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o |