Skip to content

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

Consistently use $(BUILD_ROOT). 

Originally committed as revision 6695 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a8789714
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure
View file @ 07a1b05e
...@@ -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"
......
libavformat/Makefile
View file @ 07a1b05e
...@@ -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