[x264-devel] commit: fix linking issue with the CLI (Guillaume Poirier )

[avcoder]

Dear:

it seems that this version is wrong because input/thread.c will be added
twice by following rule:

ifneq ($(findstring HAVE_PTHREAD, $(CONFIG)),)
SRCCLI += input/thread.c
endif


On Sat, Jan 30, 2010 at 10:03 PM, git version control <git at videolan.org>wrote:

> x264 | branch: master | Guillaume Poirier
> <gpoirier at MacBook-Pro-de-Guillaume-Poirier.local> | Sat Jan 30 15:02:38
> 2010 +0100| [9899cd539f738ad12750683e4079f08ee32ccc0d] | committer:
> Guillaume Poirier
>
> fix linking issue with the CLI
>
> >
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=9899cd539f738ad12750683e4079f08ee32ccc0d
> ---
>
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index cef8725..e8aae43 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -12,7 +12,7 @@ SRCS = common/mc.c common/predict.c common/pixel.c
> common/macroblock.c \
>        encoder/set.c encoder/macroblock.c encoder/cabac.c \
>        encoder/cavlc.c encoder/encoder.c encoder/lookahead.c
>
> -SRCCLI = x264.c input/yuv.c input/y4m.c output/raw.c \
> +SRCCLI = x264.c input/yuv.c input/y4m.c input/thread.c output/raw.c \
>          output/matroska.c output/matroska_ebml.c \
>          output/flv.c output/flv_bytestream.c
>
>
-- 
-----------------------------------------------------------------------------------------
My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x264-devel/attachments/20100130/3ff29439/attachment.htm>