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

Add libav include paths to CFLAGS without indirection.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-12-01 01:11:42 +00:00
parent 7b78a6cc4e
commit b125a9e129
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -6,11 +6,11 @@
include config.mak include config.mak
LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I./libavutil CFLAGS = $(OPTFLAGS) -I.
LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I./libavcodec
LIBAV_INC += $(LIBAV_INC-yes)
CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) CFLAGS-$(CONFIG_LIBAVUTIL) += -I./libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec
CFLAGS += $(CFLAGS-yes)
#CFLAGS += -Wall #CFLAGS += -Wall

6
libaf/Makefile
View File

@ -32,10 +32,10 @@ SRCS=af.c \
SRCS-$(CONFIG_LIBAVCODEC) += af_lavcresample.c SRCS-$(CONFIG_LIBAVCODEC) += af_lavcresample.c
SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c SRCS-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil CFLAGS = -D_GNU_SOURCE
LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS = $(LIBAV_INC) -D_GNU_SOURCE CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
ifeq ($(TARGET_OS),MINGW32) ifeq ($(TARGET_OS),MINGW32)
CFLAGS += -D_IO_H_ CFLAGS += -D_IO_H_

7
libmpcodecs/Makefile
View File

@ -151,18 +151,17 @@ SRCS2-$(TWOLAME) += ae_twolame.c
SRCS2-$(MP3LAME) += ae_lame.c SRCS2-$(MP3LAME) += ae_lame.c
LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil
LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec
# -I.. to include ../liba52 before ../libavcodec/liba52. # -I.. to include ../liba52 before ../libavcodec/liba52.
CFLAGS = -I.. \ CFLAGS = -I.. \
-Inative \ -Inative \
-I../libmpdemux \ -I../libmpdemux \
-I../stream \ -I../stream \
-I../loader \ -I../loader \
$(LIBAV_INC) \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
include ../mpcommon.mak include ../mpcommon.mak
clean:: clean::

8
libmpdemux/Makefile
View File

@ -68,11 +68,11 @@ SRCS2 = muxer.c \
SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c SRCS2-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c SRCS2-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil CFLAGS = -I../stream -I../loader
LIBAV_INC-$(CONFIG_LIBAVCODEC) += -I../libavcodec
LIBAV_INC-$(CONFIG_LIBAVFORMAT) += -I../libavformat
CFLAGS = -I../stream -I../loader $(LIBAV_INC) CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS CPLUSPLUSFLAGS = $(CFLAGS) -D__STDC_LIMIT_MACROS

2
mpcommon.mak
View File

@ -1,6 +1,6 @@
SRCS += $(SRCS-yes) SRCS += $(SRCS-yes)
SRCS2 += $(SRCS2-yes) SRCS2 += $(SRCS2-yes)
LIBAV_INC += $(LIBAV_INC-yes) CFLAGS += $(CFLAGS-yes)
OBJS = $(addsuffix .o, $(basename $(SRCS)) ) OBJS = $(addsuffix .o, $(basename $(SRCS)) )
OBJS2 = $(addsuffix .o, $(basename $(SRCS2)) ) OBJS2 = $(addsuffix .o, $(basename $(SRCS2)) )