Commit 58f4c79c authored by diego's avatar diego

Consistently use $(BUILD_ROOT).


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6695 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5d829f1a
...@@ -605,7 +605,7 @@ v4l="no" ...@@ -605,7 +605,7 @@ v4l="no"
v4l2="no" v4l2="no"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
VHOOKSHFLAGS="-shared -L../libavformat -L../libavcodec -L../libavutil" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
extralibs="" extralibs=""
EXESUF=".exe" EXESUF=".exe"
......
...@@ -161,7 +161,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o ...@@ -161,7 +161,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
endif endif
EXTRALIBS := -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS) EXTRALIBS := -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes) ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o CPPOBJS+= beosaudio.o
......
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