From 051963c7fee2c453d086c6792282f4c299bdf68c Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Wed, 29 Jan 2020 13:56:48 -0800 Subject: Add support for building multiple configurations Now, you can build in separate directories per configuration: mkdir foo (cd foo && ../setup.lua) samu -C foo --- pkg/ffmpeg/gen.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/ffmpeg/gen.lua') diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua index 7cdb2997..84c04056 100644 --- a/pkg/ffmpeg/gen.lua +++ b/pkg/ffmpeg/gen.lua @@ -30,7 +30,7 @@ pkg.hdrs = { } pkg.deps = { '$outdir/config.asm', - '$dir/headers', + '$gendir/headers', 'pkg/alsa-lib/headers', 'pkg/libtls-bearssl/headers', 'pkg/zlib/headers', @@ -177,7 +177,7 @@ lib('libavfilter.a', { 'libavutil.a', }) -cc('libavformat/protocols.c', {'$dir/deps', '$outdir/internal/libavformat/protocol_list.c'}) +cc('libavformat/protocols.c', {'$gendir/deps', '$outdir/internal/libavformat/protocol_list.c'}) lib('libavformat.a', { expand{'libavformat/', { 'allformats.c', @@ -352,7 +352,7 @@ local libs = { 'libswscale.a.d', } -cc('fftools/cmdutils.c', {'$dir/deps'}) +cc('fftools/cmdutils.c', {'$gendir/deps'}) exe('ffprobe', {paths[[fftools/(ffprobe.c cmdutils.c.o)]], libs}) file('bin/ffprobe', '755', '$outdir/ffprobe') -- cgit v1.2.3