Skip to content

F
ffmpeg.wasm-core
Commit 82e8566a authored by Måns Rullgård's avatar Måns Rullgård
Browse files
Options

simplify vhook/*.o rule 

Originally committed as revision 12682 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 43527e3e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
Makefile
View file @ 82e8566a
...@@ -49,9 +49,6 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) ...@@ -49,9 +49,6 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
cp -p $< $@ cp -p $< $@
$(STRIP) $@ $(STRIP) $@
vhook/%.o: vhook/%.c
$(CC) $(VHOOKCFLAGS) -c -o $@ $<
.depend: version.h $(PROGS_SRCS) .depend: version.h $(PROGS_SRCS)
# bandaid to disable triggering shared library installation routines # bandaid to disable triggering shared library installation routines
...@@ -79,6 +76,8 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs` ...@@ -79,6 +76,8 @@ LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
VHOOKCFLAGS += $(VHOOKCFLAGS-yes) VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
vhook/%.o: CFLAGS:=$(VHOOKCFLAGS)
LDFLAGS-$(CONFIG_SWSCALE) += -L$(BUILD_ROOT)/libswscale LDFLAGS-$(CONFIG_SWSCALE) += -L$(BUILD_ROOT)/libswscale
LDFLAGS-$(CONFIG_AVFILTER) += -L$(BUILD_ROOT)/libavfilter LDFLAGS-$(CONFIG_AVFILTER) += -L$(BUILD_ROOT)/libavfilter
LDFLAGS := $(LDFLAGS-yes) -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS) LDFLAGS := $(LDFLAGS-yes) -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil -g $(LDFLAGS)
......
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