* build fix (thx xxcd).

git-svn-id: svn://svn.videolan.org/x264/trunk@6 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/build/cygwin/Makefile b/build/cygwin/Makefile
index d4458cc5c3aa72ea141cc6b534f1f433fea3268e..127252500ac8cdcf3921334da6fd18f6eef620e3 100644 (file)
--- a/build/cygwin/Makefile
+++ b/build/cygwin/Makefile
@@ -4,7 +4,7 @@
 #
 # Author: x264 by Laurent Aimar <fenrir@via.ecp.fr>
 #
-# $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 2957fa018cf4c5a09692188d18a5f3857cfa725c..aa3fd7d46f54d83b7520a2b99fd9d450219d92e9 100644 (file)
--- 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 <fenrir@via.ecp.fr>
  *
@@ -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 ) \