Skip to content
Snippets Groups Projects
Commit 722dabcc authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Move conditional CFLAGS and OBJS setting to common place.

Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 150d2772
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
VPATH = $(SRC_PATH_BARE)/lib$(NAME) VPATH = $(SRC_PATH_BARE)/lib$(NAME)
SRC_DIR = "$(VPATH)" SRC_DIR = "$(VPATH)"
CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes)
CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
-I$(SRC_PATH)/libavutil $(OPTFLAGS) -I$(SRC_PATH)/libavutil $(OPTFLAGS)
......
...@@ -400,10 +400,6 @@ endif ...@@ -400,10 +400,6 @@ endif
OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \ OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec NAME=avcodec
......
...@@ -173,8 +173,6 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o ...@@ -173,8 +173,6 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
endif endif
OBJS += $(OBJS-yes)
NAME=avformat NAME=avformat
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION) LIBVERSION=$(LAVFVERSION)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment