mirror of
https://github.com/mpv-player/mpv
synced 2024-12-18 12:55:16 +00:00
fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2605 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
510d568de4
commit
a8a127a8bd
26
Makefile
26
Makefile
@ -21,10 +21,10 @@ BINDIR = ${prefix}/bin
|
||||
# a BSD compatible 'install' program
|
||||
INSTALL = install
|
||||
|
||||
SRCS_MENCODER = libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c codec-cfg.c lirc_mp.c cfgparser.c mixer.c spudec.c
|
||||
SRCS_MENCODER = mencoder.c libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c codec-cfg.c cfgparser.c
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
SRCS_MPLAYER = ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c
|
||||
SRCS_MPLAYER = mplayer.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall
|
||||
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
|
||||
@ -33,8 +33,8 @@ OSDEP_LIBS = -Llinux -losdep
|
||||
PP_LIBS = -Lpostproc -lpostproc
|
||||
XA_LIBS = -Lxa -lxa
|
||||
|
||||
SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
|
||||
OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
|
||||
# SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
|
||||
# OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
|
||||
|
||||
PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
|
||||
|
||||
@ -46,7 +46,7 @@ ifneq ($(W32_LIB),)
|
||||
PARTS += loader loader/DirectShow
|
||||
SRCS_MPLAYER += dll_init.c
|
||||
SRCS_MENCODER += dll_init.c
|
||||
SRCS += dll_init.c
|
||||
# SRCS += dll_init.c
|
||||
endif
|
||||
LOADER_DEP = $(W32_DEP) $(DS_DEP)
|
||||
LIB_LOADER = $(W32_LIB) $(DS_LIB)
|
||||
@ -114,13 +114,11 @@ postproc/libpostproc.a:
|
||||
xa/libxa.a:
|
||||
$(MAKE) -C xa
|
||||
|
||||
MPLAYER_DEP = mplayer.o $(OBJS_MPLAYER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS)
|
||||
MPLAYER_DEP = $(OBJS_MPLAYER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS)
|
||||
MENCODER_DEP = $(OBJS_MENCODER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS)
|
||||
|
||||
ifeq ($(GUI),yes)
|
||||
MPLAYER_DEP += Gui/libgui.a
|
||||
endif
|
||||
|
||||
MENCODER_DEP = mencoder.o $(OBJS_MENCODER) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS)
|
||||
ifeq ($(GUI),yes)
|
||||
MENCODER_DEP += Gui/libgui.a
|
||||
endif
|
||||
|
||||
@ -128,13 +126,13 @@ mplayerwithoutlink: $(MPLAYER_DEP)
|
||||
@for a in $(PARTS); do $(MAKE) -C $$a all ; done
|
||||
|
||||
$(PRG): $(MPLAYER_DEP)
|
||||
$(CC) -rdynamic $(CFLAGS) -o $(PRG) mplayer.o -Llibmpdemux -lmpdemux $(OBJS_MPLAYER) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm -ldivxencore
|
||||
$(CC) -rdynamic $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm -ldivxencore
|
||||
|
||||
$(PRG_FIBMAP): fibmap_mplayer.o
|
||||
$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
|
||||
|
||||
$(PRG_MENCODER): $(MENCODER_DEP)
|
||||
$(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) mencoder.o -Llibmpdemux -lmpdemux $(OBJS_MENCODER) $(X_LIBS) $(XMM_LIBS) $(LIRC_LIBS) $(LIB_LOADER) $(AV_LIB) -ldivxencore -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
|
||||
$(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame -ldivxencore -Llibmpeg2 -lmpeg2 $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm
|
||||
|
||||
# $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
|
||||
# $(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread
|
||||
@ -151,6 +149,7 @@ $(PRG_MENCODER): $(MENCODER_DEP)
|
||||
# in a recursive "make distclean" and we must wait for this "make distclean" to
|
||||
# finish before be can start builing new object files.
|
||||
$(MPLAYER_DEP): version.h
|
||||
$(MENCODER_DEP): version.h
|
||||
|
||||
$(PRG_CFG): version.h codec-cfg.c codec-cfg.h
|
||||
$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
|
||||
@ -189,8 +188,7 @@ dep: depend
|
||||
|
||||
depend:
|
||||
./version.sh
|
||||
$(CC) -MM $(CFLAGS) mplayer.c $(SRCS_MPLAYER) 1>.depend
|
||||
$(CC) -MM $(CFLAGS) mencoder.c $(SRCS_MENCODER) 1>.depend
|
||||
$(CC) -MM $(CFLAGS) mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
|
||||
@for a in $(PARTS); do $(MAKE) -C $$a dep; done
|
||||
|
||||
# ./configure must be run if it changed in CVS
|
||||
|
Loading…
Reference in New Issue
Block a user