From b2e2e34b3415cb9429475c1b828dcb2c36855308 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Thu, 10 Jun 2004 18:13:38 +0000 Subject: [PATCH] * build fix (thx xxcd). git-svn-id: svn://svn.videolan.org/x264/trunk@6 df754926-b1dd-0310-bc7b-ec298dee348c --- build/cygwin/Makefile | 6 +++--- core/i386/mc-c.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/cygwin/Makefile b/build/cygwin/Makefile index d4458cc5..12725250 100644 --- a/build/cygwin/Makefile +++ b/build/cygwin/Makefile @@ -4,7 +4,7 @@ # # Author: x264 by Laurent Aimar # -# $Id: Makefile,v 1.1 2004/06/03 19:27:06 fenrir Exp $ +# $Id: Makefile,v 1.2 2004/06/10 18:13:38 fenrir Exp $ ############################################################################## # Current dir @@ -55,7 +55,7 @@ LDFLAGS += -L$(DIR_LIB) -lx264 # ASM ############################################################################## AS= nasm -ASFLAGS= -f gnuwin32 -DPREFIX +ASFLAGS= -f win32 -DPREFIX ############################################################################## # Rules ############################################################################## @@ -93,7 +93,7 @@ libx264.a: $(DIR_BUILD) $(OBJECTS) x264.exe: $(DIR_BUILD) $(OBJECTS) x264.obj @echo " L: $(@F)" @cd $(DIR_BUILD) && \ - $(CC) $(CFLAGS) -o x264 x264.obj libx264.a -lm && \ + $(CC) $(CFLAGS) -o x264.exe x264.obj libx264.a -lm && \ cp -f x264.exe $(DIR_SRC) clean: diff --git a/core/i386/mc-c.c b/core/i386/mc-c.c index 2957fa01..aa3fd7d4 100644 --- a/core/i386/mc-c.c +++ b/core/i386/mc-c.c @@ -2,7 +2,7 @@ * mc.c: h264 encoder library (Motion Compensation) ***************************************************************************** * Copyright (C) 2003 Laurent Aimar - * $Id: mc-c.c,v 1.2 2004/06/09 19:35:07 fenrir Exp $ + * $Id: mc-c.c,v 1.3 2004/06/10 18:13:38 fenrir Exp $ * * Authors: Laurent Aimar * @@ -38,7 +38,7 @@ static const uint64_t foo __asm__ (#foo) __attribute__((unused)) #endif -UNUSED_UINT64( x264_w0x10 ) = 0x0010001000100010ULL; +USED_UINT64( x264_w0x10 ) = 0x0010001000100010ULL; #define MMX_ZERO( MMZ ) \ -- 2.40.0