mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones. Originally committed as revision 6016 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a9f9cc7cc1
commit
7981555d89
@ -5,7 +5,7 @@
|
|||||||
include ../config.mak
|
include ../config.mak
|
||||||
|
|
||||||
# NOTE: -I.. is needed to include config.h
|
# NOTE: -I.. is needed to include config.h
|
||||||
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \
|
CFLAGS=-DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil $(OPTFLAGS) \
|
||||||
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS)
|
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS)
|
||||||
|
|
||||||
OBJS= bitstream.o utils.o allcodecs.o \
|
OBJS= bitstream.o utils.o allcodecs.o \
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
#
|
#
|
||||||
include ../config.mak
|
include ../config.mak
|
||||||
|
|
||||||
CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
|
CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
|
||||||
-I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 \
|
$(OPTFLAGS) -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 \
|
||||||
-D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
|
-D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
|
||||||
|
|
||||||
OBJS= utils.o cutils.o os_support.o allformats.o
|
OBJS= utils.o cutils.o os_support.o allformats.o
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
include ../config.mak
|
include ../config.mak
|
||||||
|
|
||||||
# NOTE: -I.. is needed to include config.h
|
# NOTE: -I.. is needed to include config.h
|
||||||
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. \
|
CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. $(OPTFLAGS) \
|
||||||
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
|
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
|
||||||
|
|
||||||
OBJS= mathematics.o \
|
OBJS= mathematics.o \
|
||||||
|
@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o
|
|||||||
|
|
||||||
HEADERS = postprocess.h
|
HEADERS = postprocess.h
|
||||||
|
|
||||||
CFLAGS = $(OPTFLAGS) -I.. -I$(SRC_PATH)/libavcodec
|
CFLAGS = -I.. -I$(SRC_PATH)/libavcodec $(OPTFLAGS)
|
||||||
# -I/usr/X11R6/include/
|
# -I/usr/X11R6/include/
|
||||||
|
|
||||||
include $(SRC_PATH)/common.mak
|
include $(SRC_PATH)/common.mak
|
||||||
|
@ -2,8 +2,8 @@ include ../config.mak
|
|||||||
|
|
||||||
VPATH=$(SRC_PATH)/vhook
|
VPATH=$(SRC_PATH)/vhook
|
||||||
|
|
||||||
CFLAGS=$(VHOOKCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \
|
CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
|
||||||
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
|
-I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
|
||||||
|
|
||||||
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
|
HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
|
||||||
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
|
ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user