Skip to content

F
ffmpeg.wasm-core
Commit 95dd1741 authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files
Options

Allow running make in subdirs again.

parent 2ec89922
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
Makefile
View file @ 95dd1741
...@@ -42,6 +42,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) ...@@ -42,6 +42,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset)
SKIPHEADERS = cmdutils_common_opts.h SKIPHEADERS = cmdutils_common_opts.h
MAIN_MAKEFILE=1
include common.mak include common.mak
FF_LDFLAGS := $(FFLDFLAGS) FF_LDFLAGS := $(FFLDFLAGS)
......
common.mak
View file @ 95dd1741
...@@ -7,6 +7,12 @@ all: all-yes ...@@ -7,6 +7,12 @@ all: all-yes
ifndef SUBDIR ifndef SUBDIR
ifndef MAIN_MAKEFILE
ifeq ($(SRC_PATH),.)
SRC_PATH = ..
endif
endif
ifndef V ifndef V
Q = @ Q = @
ECHO = printf "$(1)\t%s\n" $(2) ECHO = printf "$(1)\t%s\n" $(2)
......
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