Commit 49f0405c authored by bellard's avatar bellard

fixed multidir compile


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1289 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5fa189f6
...@@ -678,9 +678,9 @@ echo "#define restrict $_restrict" >> $TMPH ...@@ -678,9 +678,9 @@ echo "#define restrict $_restrict" >> $TMPH
# build tree in object directory if source path is different from current one # build tree in object directory if source path is different from current one
if test "$source_path_used" = "yes" ; then if test "$source_path_used" = "yes" ; then
DIRS="libav libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \ DIRS="libavformat libavcodec libavcodec/alpha libavcodec/armv4l libavcodec/i386 \
libavcodec/ppc libavcodec/liba52 libavcodec/mlib tests" libavcodec/ppc libavcodec/liba52 libavcodec/mlib tests vhook"
FILES="Makefile libav/Makefile libavcodec/Makefile tests/Makefile" FILES="Makefile libavformat/Makefile libavcodec/Makefile tests/Makefile vhook/Makefile"
for dir in $DIRS ; do for dir in $DIRS ; do
mkdir -p $dir mkdir -p $dir
done done
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
include ../config.mak include ../config.mak
VPATH=$(SRC_PATH)/libav VPATH=$(SRC_PATH)/libavformat
CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
......
...@@ -2,7 +2,7 @@ include ../config.mak ...@@ -2,7 +2,7 @@ include ../config.mak
VPATH=$(SRC_PATH)/vhook VPATH=$(SRC_PATH)/vhook
CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H CFLAGS=-fPIC $(OPTFLAGS) -g -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
ifeq ($(CONFIG_DARWIN),yes) ifeq ($(CONFIG_DARWIN),yes)
SHFLAGS+=-bundle -flat_namespace -undefined suppress SHFLAGS+=-bundle -flat_namespace -undefined suppress
......
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