rename *.asm to avoid conflicts with libtool

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

diff --git a/Makefile b/Makefile
index 87f6d4cc10a8191b42c79d28f373eb5a7fc3b8c4..c9ea68bbc00fac369b267dc5f56ac278a93c30c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SRCS= $(SRCS_COMMON) common/ppc/mc.c common/ppc/pixel.c
 else
 PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2 -DHAVE_MALLOC_H
 SRCS= $(SRCS_COMMON) common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
-ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
+ASMSRC= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm
 OBJASM= $(ASMSRC:%.asm=%.o)
 endif
 

diff --git a/Makefile.cygwin b/Makefile.cygwin
index 33b2872ab258b6bbc3e8177f856147bdc3b24b8f..7033f0fd71a2a717f157a77a23b6b6f9e52552ba 100644 (file)
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -17,7 +17,7 @@ AS= nasm
 #for cygwin
 ASFLAGS=-f win32 -DPREFIX $(PFLAGS)
           
-ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
+ASMSRC= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm
 OBJASM= $(ASMSRC:%.asm=%.o)
 
 OBJS = $(SRCS:%.c=%.o)

diff --git a/build/cygwin/Makefile b/build/cygwin/Makefile
index 66460e1378c84bc0db1c3585c61328630ab3dbac..d3935c7bd14abcf6e87bb805aad06d648bdda7f4 100644 (file)
--- a/build/cygwin/Makefile
+++ b/build/cygwin/Makefile
@@ -22,7 +22,7 @@ SRC_C= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
        encoder/encoder.c encoder/eval.c \
        common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
 
-SRC_ASM= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
+SRC_ASM= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm
 
 # Alias
 RM= rm -rf

diff --git a/build/win32/libx264.dsp b/build/win32/libx264.dsp
index 7fa723cc7eac38d61f2c8964bc1d07b831547f89..ed046adb697c77d8cbc671cf9f9b667c5f3e9bcf 100644 (file)
--- a/build/win32/libx264.dsp
+++ b/build/win32/libx264.dsp
@@ -310,16 +310,16 @@ SOURCE=..\..\common\vlc.h
 # End Group
 # Begin Group "I386"
 
-# PROP Default_Filter "*.h,*.c,*.asm"
+# PROP Default_Filter "*.h,*.c,*-a.asm"
 # Begin Source File
 
-SOURCE=..\..\common\i386\cpu.asm
+SOURCE=..\..\common\i386\cpu-a.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\common\i386\cpu.asm
+InputPath=..\..\common\i386\cpu-a.asm
 InputName=cpu
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -331,7 +331,7 @@ InputName=cpu
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\common\i386\cpu.asm
+InputPath=..\..\common\i386\cpu-a.asm
 InputName=cpu
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -348,13 +348,13 @@ SOURCE="..\..\common\i386\dct-c.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\common\i386\dct.asm
+SOURCE=..\..\common\i386\dct-a.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\common\i386\dct.asm
+InputPath=..\..\common\i386\dct-a.asm
 InputName=dct
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -366,7 +366,7 @@ InputName=dct
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\common\i386\dct.asm
+InputPath=..\..\common\i386\dct-a.asm
 InputName=dct
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -396,13 +396,13 @@ SOURCE="..\..\common\i386\mc-c.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\common\i386\mc.asm
+SOURCE=..\..\common\i386\mc-a.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\common\i386\mc.asm
+InputPath=..\..\common\i386\mc-a.asm
 InputName=mc
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -414,7 +414,7 @@ InputName=mc
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\common\i386\mc.asm
+InputPath=..\..\common\i386\mc-a.asm
 InputName=mc
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -427,13 +427,13 @@ InputName=mc
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\common\i386\pixel.asm
+SOURCE=..\..\common\i386\pixel-a.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\common\i386\pixel.asm
+InputPath=..\..\common\i386\pixel-a.asm
 InputName=pixel
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -445,7 +445,7 @@ InputName=pixel
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\common\i386\pixel.asm
+InputPath=..\..\common\i386\pixel-a.asm
 InputName=pixel
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

diff --git a/common/i386/cpu.asm b/common/i386/cpu-a.asm
similarity index 100%
rename from common/i386/cpu.asm
rename to common/i386/cpu-a.asm

diff --git a/common/i386/dct.asm b/common/i386/dct-a.asm
similarity index 100%
rename from common/i386/dct.asm
rename to common/i386/dct-a.asm

diff --git a/common/i386/mc.asm b/common/i386/mc-a.asm
similarity index 100%
rename from common/i386/mc.asm
rename to common/i386/mc-a.asm

diff --git a/common/i386/pixel.asm b/common/i386/pixel-a.asm
similarity index 100%
rename from common/i386/pixel.asm
rename to common/i386/pixel-a.asm