mirror of
https://github.com/mpv-player/mpv
synced 2025-02-07 07:31:48 +00:00
compiling and linking liba52 too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3407 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8f606b1808
commit
9594de2487
9
Makefile
9
Makefile
@ -34,7 +34,7 @@ CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) # -Wall
|
|||||||
VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
|
VO_LIBS = -Llibvo2 -lvo2 $(X_LIB) $(DXR3_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
|
A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52 $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
|
||||||
|
|
||||||
OSDEP_LIBS = -Llinux -losdep
|
OSDEP_LIBS = -Llinux -losdep
|
||||||
PP_LIBS = -Lpostproc -lpostproc
|
PP_LIBS = -Lpostproc -lpostproc
|
||||||
@ -43,7 +43,7 @@ XA_LIBS = -Lxa -lxa
|
|||||||
# SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
|
# SRCS = $(SRCS_MENCODER) $(SRCS_MPLAYER)
|
||||||
# OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
|
# OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
|
||||||
|
|
||||||
PARTS = libmpdemux mp3lib libac3 libmp1e libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
|
PARTS = libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
|
||||||
ifeq ($(VO2),yes)
|
ifeq ($(VO2),yes)
|
||||||
PARTS = libmpdemux mp3lib libac3 libmp1e libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
|
PARTS = libmpdemux mp3lib libac3 libmp1e libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
|
||||||
endif
|
endif
|
||||||
@ -81,7 +81,7 @@ all: $(ALL_PRG)
|
|||||||
.c.o:
|
.c.o:
|
||||||
$(CC) -c $(CFLAGS) -o $@ $<
|
$(CC) -c $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
|
COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
|
||||||
ifeq ($(VO2),yes)
|
ifeq ($(VO2),yes)
|
||||||
COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
|
COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmp1e/libmp1e.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
|
||||||
endif
|
endif
|
||||||
@ -116,6 +116,9 @@ libao2/libao2.a:
|
|||||||
libac3/libac3.a:
|
libac3/libac3.a:
|
||||||
$(MAKE) -C libac3
|
$(MAKE) -C libac3
|
||||||
|
|
||||||
|
liba52/liba52.a:
|
||||||
|
$(MAKE) -C liba52
|
||||||
|
|
||||||
mp3lib/libMP3.a:
|
mp3lib/libMP3.a:
|
||||||
$(MAKE) -C mp3lib
|
$(MAKE) -C mp3lib
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user