summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--configure.ac18
-rw-r--r--libass/Makefile.am8
3 files changed, 14 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 45ca101..3717261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ branches:
before_install:
- (sudo apt-get update || brew update)
- - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev yasm || brew install freetype fribidi yasm) && ./autogen.sh && ./configure
+ - (sudo apt-get install -y libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev nasm || brew install freetype fribidi nasm) && ./autogen.sh && ./configure
script:
- make -j4
diff --git a/configure.ac b/configure.ac
index d4c3f3b..cc223d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,20 +58,20 @@ AS_IF([test x$enable_asm != xno], [
AS_CASE([$host],
[i?86-*], [
INTEL=true
- AS=yasm
+ AS=nasm
X86=true
BITS=32
BITTYPE=32
ASFLAGS="$ASFLAGS -DARCH_X86_64=0" ],
[x86_64-*-gnux32|amd64-*-gnux32], [
- AS=yasm
+ AS=nasm
INTEL=true
X64=true
BITS=64
BITTYPE=x32
ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ],
[x86_64-*|amd64-*], [
- AS=yasm
+ AS=nasm
INTEL=true
X64=true
BITS=64
@@ -79,10 +79,10 @@ AS_IF([test x$enable_asm != xno], [
ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ],
)
AS_IF([test x$INTEL = xtrue], [
- AC_CHECK_PROG([yasm_check], [$AS], [yes])
- AS_IF([test x$yasm_check != xyes], [
- AC_MSG_WARN(yasm was not found; ASM functions are disabled.)
- AC_MSG_WARN(Install yasm for a significantly faster libass build.)
+ 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.)
+ AC_MSG_WARN(Install nasm for a significantly faster libass build.)
enable_asm=no
], [
AS_CASE([$host],
@@ -106,8 +106,8 @@ AS_IF([test x$enable_asm != xno], [
], [
AC_MSG_RESULT([no])
VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
- AC_MSG_WARN([yasm is too old (found $VER); ASM functions are disabled.])
- AC_MSG_WARN([Install yasm-1.2.0 or later for a significantly faster libass build.])
+ AC_MSG_WARN([nasm is too old (found $VER); ASM functions are disabled.])
+ AC_MSG_WARN([Install nasm-2.10 or later for a significantly faster libass build.])
enable_asm=no
])
rm conftest.asm conftest.o > /dev/null 2>&1
diff --git a/libass/Makefile.am b/libass/Makefile.am
index bd763d4..bc8481f 100644
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -6,12 +6,12 @@ LIBASS_LT_CURRENT = 9
LIBASS_LT_REVISION = 1
LIBASS_LT_AGE = 0
-yasm_verbose = $(yasm_verbose_$(V))
-yasm_verbose_ = $(yasm_verbose_$(AM_DEFAULT_VERBOSITY))
-yasm_verbose_0 = @echo " YASM " $@;
+nasm_verbose = $(nasm_verbose_$(V))
+nasm_verbose_ = $(nasm_verbose_$(AM_DEFAULT_VERBOSITY))
+nasm_verbose_0 = @echo " NASM " $@;
.asm.lo:
- $(yasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic
+ $(nasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic
SRC_INTEL = x86/rasterizer.asm x86/blend_bitmaps.asm x86/blur.asm x86/cpuid.asm \
x86/cpuid.h