diff options
| author | phintuka <phintuka> | 2012-07-29 08:55:00 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2012-07-29 08:55:00 +0000 |
| commit | c3fddcc3b151a023fdf60ffb792c52640610dd10 (patch) | |
| tree | fc1f59a42a1b19d94ce8addb755bd951b8771165 | |
| parent | 2b5a50ba57bb7c87961d11ef0687ece658ae9c0d (diff) | |
| download | xineliboutput-c3fddcc3b151a023fdf60ffb792c52640610dd10.tar.gz xineliboutput-c3fddcc3b151a023fdf60ffb792c52640610dd10.tar.bz2 | |
Pass libavutil CFLAGS from pkg-config to gcc
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.109 2012-03-07 08:29:50 phintuka Exp $ +# $Id: Makefile,v 1.110 2012-07-29 08:55:00 phintuka Exp $ # # The official name of this plugin. @@ -284,7 +284,7 @@ vdrlogo_720x576.c: mpg2c vdrlogo_720x576.mpg # C code (xine plugins and frontends) $(sort $(OBJS_SXFE) $(OBJS_FBFE) $(OBJS_XINE)): - $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(CFLAGS_X11) $(OPTFLAGS) -o $@ $< + $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(CFLAGS_X11) $(CFLAGS_AVUTIL) $(OPTFLAGS) -o $@ $< ### Internationalization (I18N): ifeq ($(HAVE_I18N), yes) @@ -7,7 +7,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# * $Id: configure,v 1.40 2012-01-30 11:24:38 phintuka Exp $ +# * $Id: configure,v 1.41 2012-07-29 08:55:00 phintuka Exp $ # PKG_CONFIG="pkg-config" @@ -467,6 +467,7 @@ echo "CXX = $CXX">>$makefile echo "CFLAGS_XINE += $CFLAGS_XINE">>$makefile echo "CFLAGS_VDR += $CFLAGS_VDR">>$makefile echo "CFLAGS_X11 += $CFLAGS_X11">>$makefile +echo "CFLAGS_AVUTIL += $CFLAGS_AVUTIL">>$makefile echo "LIBS_XINE += $LIBS_XINE">>$makefile echo "LIBS_JPEG += $LIBS_JPEG">>$makefile echo "LIBS_AVUTIL += $LIBS_AVUTIL">>$makefile |