Actually, use a more style compliant name, and since the flags don't contain
just architecture specific flags, call them just HAIKU_FFMPEG_DEFINES. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31432 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
7486c08251
commit
a612697fc9
|
@ -19,37 +19,37 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
|
|||
|
||||
# NOTE: This is intentionally a global variable, so we can re-use it in
|
||||
# sub-folders.
|
||||
FFMPEG_PLATFORM_DEFINES = HAVE_AV_CONFIG_H=1 ;
|
||||
HAIKU_FFMPEG_DEFINES = HAVE_AV_CONFIG_H=1 ;
|
||||
|
||||
if $(TARGET_ARCH) = x86 {
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_X86=1 ARCH_X86_32=1 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_PPC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_SPARC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_MMX=1 HAVE_MMX2=1 HAVE_SSE=0 HAVE_SSE3=1 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_ALTIVEC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_VIS=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_X86=1 ARCH_X86_32=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_PPC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_SPARC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_MMX=1 HAVE_MMX2=1 HAVE_SSE=0 HAVE_SSE3=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_VIS=0 ;
|
||||
} else if $(TARGET_ARCH) = ppc {
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_X86=0 ARCH_X86_32=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_PPC=1 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_SPARC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSE3=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_ALTIVEC=1 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_VIS=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_X86=0 ARCH_X86_32=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_PPC=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_SPARC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSE3=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_VIS=0 ;
|
||||
} else if $(TARGET_ARCH) = sparc {
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_X86=0 ARCH_X86_32=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_PPC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += ARCH_SPARC=1 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSE3=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_ALTIVEC=0 ;
|
||||
FFMPEG_PLATFORM_DEFINES += HAVE_VIS=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_X86=0 ARCH_X86_32=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_PPC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += ARCH_SPARC=1 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSE3=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=0 ;
|
||||
HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
|
||||
}
|
||||
|
||||
FFMPEG_PLATFORM_DEFINES = [ FDefines $(FFMPEG_PLATFORM_DEFINES) ] ;
|
||||
SubDirCcFlags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirC++Flags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
HAIKU_FFMPEG_DEFINES = [ FDefines $(HAIKU_FFMPEG_DEFINES) ] ;
|
||||
SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
|
||||
StaticLibrary libavcodec.a :
|
||||
4xm.c
|
||||
|
|
|
@ -18,8 +18,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
|
|||
# Enable altivec support
|
||||
SubDirCcFlags -maltivec -mabi=altivec ;
|
||||
|
||||
SubDirCcFlags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirC++Flags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
|
||||
StaticLibrary libavcodec_ppc.a :
|
||||
check_altivec.c
|
||||
|
|
|
@ -15,8 +15,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
|
|||
SubDirCcFlags -fomit-frame-pointer -DPIC ;
|
||||
}
|
||||
|
||||
SubDirCcFlags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirC++Flags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
|
||||
StaticLibrary libavcodec_sparc.a :
|
||||
dsputil_vis.c
|
||||
|
|
|
@ -15,8 +15,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 3 {
|
|||
SubDirCcFlags -fomit-frame-pointer -DPIC ;
|
||||
}
|
||||
|
||||
SubDirCcFlags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirC++Flags $(FFMPEG_PLATFORM_DEFINES) ;
|
||||
SubDirCcFlags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
SubDirC++Flags $(HAIKU_FFMPEG_DEFINES) ;
|
||||
|
||||
StaticLibrary libavcodec_x86.a :
|
||||
cpuid.c
|
||||
|
|
Loading…
Reference in New Issue