<div>Dear:</div><div><br></div><div>it seems that this version is wrong because input/thread.c will be added twice by following rule:</div><div><br></div><div>ifneq ($(findstring HAVE_PTHREAD, $(CONFIG)),)</div><div>SRCCLI += input/thread.c</div>
<div>endif</div><div><br></div><br><div class="gmail_quote">On Sat, Jan 30, 2010 at 10:03 PM, git version control <span dir="ltr"><<a href="mailto:git@videolan.org">git@videolan.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
x264 | branch: master | Guillaume Poirier <gpoirier@MacBook-Pro-de-Guillaume-Poirier.local> | Sat Jan 30 15:02:38 2010 +0100| [9899cd539f738ad12750683e4079f08ee32ccc0d] | committer: Guillaume Poirier<br>
<br>
fix linking issue with the CLI<br>
<br>
> <a href="http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=9899cd539f738ad12750683e4079f08ee32ccc0d" target="_blank">http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=9899cd539f738ad12750683e4079f08ee32ccc0d</a><br>
---<br>
<br>
Makefile | 2 +-<br>
1 files changed, 1 insertions(+), 1 deletions(-)<br>
<br>
diff --git a/Makefile b/Makefile<br>
index cef8725..e8aae43 100644<br>
--- a/Makefile<br>
+++ b/Makefile<br>
@@ -12,7 +12,7 @@ SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \<br>
encoder/set.c encoder/macroblock.c encoder/cabac.c \<br>
encoder/cavlc.c encoder/encoder.c encoder/lookahead.c<br>
<br>
-SRCCLI = x264.c input/yuv.c input/y4m.c output/raw.c \<br>
+SRCCLI = x264.c input/yuv.c input/y4m.c input/thread.c output/raw.c \<br>
output/matroska.c output/matroska_ebml.c \<br>
output/flv.c output/flv_bytestream.c<br><br></blockquote><div> </div></div>-- <br>-----------------------------------------------------------------------------------------<br>My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2<br>