From b42bd7463a00b65f1e2d5e2c10ff374531e997f6 Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Fri, 31 Dec 2004 01:56:26 +0000 Subject: [PATCH] rename *.asm to avoid conflicts with libtool git-svn-id: svn://svn.videolan.org/x264/trunk@79 df754926-b1dd-0310-bc7b-ec298dee348c --- Makefile | 2 +- Makefile.cygwin | 2 +- build/cygwin/Makefile | 2 +- build/win32/libx264.dsp | 26 +++++++++++++------------- common/i386/{cpu.asm => cpu-a.asm} | 0 common/i386/{dct.asm => dct-a.asm} | 0 common/i386/{mc.asm => mc-a.asm} | 0 common/i386/{pixel.asm => pixel-a.asm} | 0 8 files changed, 16 insertions(+), 16 deletions(-) rename common/i386/{cpu.asm => cpu-a.asm} (100%) rename common/i386/{dct.asm => dct-a.asm} (100%) rename common/i386/{mc.asm => mc-a.asm} (100%) rename common/i386/{pixel.asm => pixel-a.asm} (100%) diff --git a/Makefile b/Makefile index 87f6d4cc..c9ea68bb 100644 --- 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 33b2872a..7033f0fd 100644 --- 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 66460e13..d3935c7b 100644 --- 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 7fa723cc..ed046adb 100644 --- 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 -- 2.40.0