Skip to content

F
ffmpeg.wasm-core
Commit cbeee4d8 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

Replace -I../-I. by -I$(BUILD_ROOT). 

Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4aad0d6d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
Makefile
View file @ cbeee4d8
...@@ -6,7 +6,7 @@ include config.mak ...@@ -6,7 +6,7 @@ include config.mak
VPATH=$(SRC_PATH) VPATH=$(SRC_PATH)
CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
LDFLAGS+= -g LDFLAGS+= -g
......
libavcodec/Makefile
View file @ cbeee4d8
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
# #
include ../config.mak include ../config.mak
# NOTE: -I.. is needed to include config.h CFLAGS=-DHAVE_AV_CONFIG_H -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS) \
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 \ OBJS= bitstream.o \
......
libavformat/Makefile
View file @ cbeee4d8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
include ../config.mak include ../config.mak
CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
$(OPTFLAGS) -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
......
libavutil/Makefile
View file @ cbeee4d8
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# #
include ../config.mak include ../config.mak
# NOTE: -I.. is needed to include config.h CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I$(BUILD_ROOT) $(OPTFLAGS) \
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 \
......
libpostproc/Makefile
View file @ cbeee4d8
...@@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o ...@@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o
HEADERS = postprocess.h HEADERS = postprocess.h
CFLAGS = -I.. -I$(SRC_PATH)/libavutil $(OPTFLAGS) CFLAGS = -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS)
include $(SRC_PATH)/common.mak include $(SRC_PATH)/common.mak
......
vhook/Makefile
View file @ cbeee4d8
...@@ -2,7 +2,7 @@ include ../config.mak ...@@ -2,7 +2,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook VPATH=$(SRC_PATH)/vhook
CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
-I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H -I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
LDFLAGS+= -g LDFLAGS+= -g
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment