diff options
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | libass/Makefile.am | 8 | ||||
| -rw-r--r-- | libass/x86/cpuid.h | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index c84a260..7186578 100644 --- a/configure.ac +++ b/configure.ac @@ -214,34 +214,34 @@ can_asm=false AS_IF([test "x$enable_asm" != xno], [ AS_CASE([$host], [i?86-*], [ - INTEL=true AS=nasm + X86=true BITS=32 BITTYPE=32 ASFLAGS="$ASFLAGS -DARCH_X86_64=0" ], [x86_64-*-gnux32|amd64-*-gnux32], [ AS=nasm - INTEL=true - X64=true + X86=true + X86_64=true BITS=64 BITTYPE=x32 ASFLAGS="$ASFLAGS -DARCH_X86_64=1" ], [x86_64-*|amd64-*], [ AS=nasm - INTEL=true - X64=true + X86=true + X86_64=true BITS=64 BITTYPE=64 ASFLAGS="$ASFLAGS -DARCH_X86_64=1" ], [ # default - INTEL=false + X86=false AC_MSG_NOTICE([Assembly optimizations are not yet supported on this architecture; disabling.]) ] ) - AS_IF([test "x$INTEL" = xtrue], [ + AS_IF([test "x$X86" = xtrue], [ AC_CHECK_PROG([nasm_check], [$AS], [yes]) AS_IF([test "x$nasm_check" != xyes], [ AC_MSG_WARN(nasm was not found; ASM functions are disabled.) @@ -306,8 +306,8 @@ AC_SUBST([PKG_REQUIRES_PRIVATE], [${pkg_requires}]) ## Setup conditionals for use in Makefiles AM_CONDITIONAL([ASM], [test "x$can_asm" = xtrue]) -AM_CONDITIONAL([INTEL], [test "x$INTEL" = xtrue]) -AM_CONDITIONAL([X64], [test "x$X64" = xtrue]) +AM_CONDITIONAL([X86], [test "x$X86" = xtrue]) +AM_CONDITIONAL([X86_64], [test "x$X86_64" = xtrue]) AM_CONDITIONAL([ENABLE_LARGE_TILES], [test "x$enable_large_tiles" = xyes]) diff --git a/libass/Makefile.am b/libass/Makefile.am index 207fe27..a088130 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -14,8 +14,8 @@ nasm_verbose_0 = @echo " NASM " $@; .asm.lo: $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(top_srcdir)/ltnasm.sh $(AS) $(ASFLAGS) -I$(srcdir)/ -Dprivate_prefix=ass -o $@ $< -SRC_INTEL = x86/rasterizer.asm x86/blend_bitmaps.asm x86/be_blur.asm x86/blur.asm x86/cpuid.asm \ - x86/cpuid.h +SRC_X86 = x86/rasterizer.asm x86/blend_bitmaps.asm x86/be_blur.asm x86/blur.asm x86/cpuid.asm \ + x86/cpuid.h SRC_FONTCONFIG = ass_fontconfig.c ass_fontconfig.h SRC_DIRECTWRITE = ass_directwrite.c ass_directwrite.h ass_directwrite_info_template.h dwrite_c.h @@ -48,8 +48,8 @@ libass_la_SOURCES += $(SRC_CORETEXT) endif if ASM -if INTEL -libass_la_SOURCES += $(SRC_INTEL) +if X86 +libass_la_SOURCES += $(SRC_X86) endif endif diff --git a/libass/x86/cpuid.h b/libass/x86/cpuid.h index 59467bc..ab50292 100644 --- a/libass/x86/cpuid.h +++ b/libass/x86/cpuid.h @@ -16,8 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef INTEL_CPUID_H -#define INTEL_CPUID_H +#ifndef LIBASS_X86_CPUID_H +#define LIBASS_X86_CPUID_H #include <stdint.h> |