RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-07 07:31:48 +00:00
Code Issues Releases Wiki Activity

Merge libao2/Makefile into top-level Makefile.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-23 09:33:51 +00:00
parent e8d9d7db4e
commit 2bcda50ffe
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -111,6 +111,11 @@ SRCS_MPLAYER = mplayer.c \
parser-mpcmd.c \ parser-mpcmd.c \
command.c \ command.c \
input/input.c \ input/input.c \
libao2/audio_out.c \
libao2/ao_mpegpes.c \
libao2/ao_null.c \
libao2/ao_pcm.c \
$(addprefix libao2/,$(AO_SRCS)) \
SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
@ -191,7 +196,6 @@ COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a
COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
LIBS_MPLAYER = libvo/libvo.a \ LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \
LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a
@ -216,7 +220,6 @@ INSTALL_TARGETS += $(INSTALL_TARGETS-yes)
PARTS = dvdread \ PARTS = dvdread \
liba52 \ liba52 \
libao2 \
libavcodec \ libavcodec \
libavformat \ libavformat \
libavutil \ libavutil \
@ -244,6 +247,7 @@ DIRS = gui \
gui/win32 \ gui/win32 \
input \ input \
libaf \ libaf \
libao2 \
libass \ libass \
libmenu \ libmenu \
osdep \ osdep \

11
libao2/Makefile
View File

@ -1,11 +0,0 @@
include ../config.mak
LIBNAME_MPLAYER = libao2.a
SRCS_MPLAYER = audio_out.c \
ao_mpegpes.c \
ao_null.c \
ao_pcm.c \
$(AO_SRCS) \
include ../mpcommon.mak