virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move conditional CFLAGS and OBJS setting to common place.

Browse Source 
Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-01-25 00:34:38 +00:00
parent 150d27725b
commit 722dabcc94
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mak
View File

@ -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)

4
libavcodec/Makefile
View File

@ -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

2
libavformat/Makefile
View File

@ -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)