Commit b42bd746 authored by Loren Merritt's avatar Loren Merritt

rename *.asm to avoid conflicts with libtool


git-svn-id: svn://svn.videolan.org/x264/trunk@79 df754926-b1dd-0310-bc7b-ec298dee348c
parent dabd095c
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment