summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-04 22:00:25 +0000
committerlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-04 22:00:25 +0000
commit1e880aa659cc8d82357c175d6142cfd0606eea22 (patch)
treee85a5a66e08f6ad71f8638470e19539c26a6bb54 /Makefile
parent31235dd9a42beb26105918190af7cffc2f20ff07 (diff)
downloadmpv-1e880aa659cc8d82357c175d6142cfd0606eea22.tar.bz2
mpv-1e880aa659cc8d82357c175d6142cfd0606eea22.tar.xz
FLAC decoding support via imported libmpflac.
TODO: fix FLAC-in-ogg decoding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11005 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f2f3214628..19e77e5220 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB)
AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
+COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FLAC_LIB)
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) # -Wall
@@ -67,6 +67,9 @@ endif
ifeq ($(LIBMENU),yes)
PARTS += libmenu
endif
+ifneq ($(MPFLAC),none)
+PARTS += libmpflac
+endif
ALL_PRG = $(PRG)
ifeq ($(MENCODER),yes)
@@ -105,6 +108,10 @@ COMMON_DEPS += Gui/libgui.a
GUI_LIBS = Gui/libgui.a
endif
+ifneq ($(MPFLAC),none)
+COMMON_DEPS += libmpflac/libmpflac.a
+endif
+
.SUFFIXES: .cc .c .o
# .PHONY: $(COMMON_DEPS)
@@ -186,6 +193,9 @@ libmenu/libmenu.a:
libavcodec/libpostproc/libpostproc.so:
$(MAKE) -C libavcodec/libpostproc
+libmpflac/libmpflac.a:
+ $(MAKE) -C libmpflac
+
MPLAYER_DEP = $(OBJS_MPLAYER) $(COMMON_DEPS)
ifeq ($(LIBMENU),yes)