[x264-devel] Re: Fwd: svn 487: Makefile:71: *** missing separator. Stop.

[Måns Rullgård]

"sean darcy" <seandarcy2 at gmail.com> writes:

> Here are lines 67-72 of Makefile:
>
> libx264.a: .depend $(OBJS) $(OBJASM)
> 	ar rc libx264.a $(OBJS) $(OBJASM)
> 	ranlib libx264.a
>
> <<<<<<< .mine
> x264$(EXE): libx264.a x264.o matroska.o

Looks like you've edited the makefile, then done an svn update with
conflicts.  Fix the conflicts, or do a clean checkout.

-- 
Måns Rullgård
mru at inprovide.com

-- 
This is the x264-devel mailing-list
To unsubscribe, go to: http://developers.videolan.org/lists.html