diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-18 17:08:22 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-18 17:08:22 +0000 |
| commit | 00a4249b4af04b1d9537e653e0b9779e74bd13b8 (patch) | |
| tree | 7331faf540bb1e80cfb3fe6a0d42a3feedc16810 | |
| parent | 6bfc62a9b98833da2fc67b7b2bc0ce0dad95a45c (diff) | |
| download | mpv-00a4249b4af04b1d9537e653e0b9779e74bd13b8.tar.bz2 mpv-00a4249b4af04b1d9537e653e0b9779e74bd13b8.tar.xz | |
Just a tiny fix with configure/Makefile for not using
"caca-config --cflags", patch by Pigeon <pigeon@pigeond.net>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12612 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -37,7 +37,7 @@ 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 $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) # -Wall +CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libavformat libao2 drivers osdep postproc input libvo libaf ifeq ($(INTERNAL_FAAD),yes) @@ -3408,6 +3408,7 @@ EOF fi if test "$_caca" = yes ; then _def_caca='#define HAVE_CACA 1' + _inc_caca=`caca-config --cflags` _ld_caca=`caca-config --libs` _vosrc="$_vosrc vo_caca.c" _vomodules="caca $_vomodules" @@ -6033,6 +6034,7 @@ GIF_LIB = $_ld_gif SDL_LIB = $_ld_sdl SVGA_LIB = $_ld_svga AA_LIB = $_ld_aa +CACA_INC = $_inc_caca CACA_LIB = $_ld_caca # audio output |