summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrcombs <rcombs@rcombs.me>2020-05-29 19:59:58 -0500
committerDr.Smile <vabnick@gmail.com>2021-12-06 03:59:51 +0300
commit5fede0443b4e1b052ce2cd36c41d2196250ae3bf (patch)
treea12d1b47ca3d19fce85301320ebc3913a5402111
parentb6615eeaae36b086f47480234cb59678aa8a85d7 (diff)
downloadlibass-5fede0443b4e1b052ce2cd36c41d2196250ae3bf.tar.bz2
libass-5fede0443b4e1b052ce2cd36c41d2196250ae3bf.tar.xz
build: move private_prefix define to Makefile.am
-rw-r--r--configure.ac1
-rw-r--r--libass/Makefile.am2
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 71e4a57..0af6e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,6 @@ AS_IF([test "x$enable_asm" != xno], [
))
]
)
- ASFLAGS="$ASFLAGS -Dprivate_prefix=ass"
AC_MSG_CHECKING([if $AS supports vpmovzxwd])
echo "vpmovzxwd ymm0, xmm0" > conftest.asm
AS_IF([$AS conftest.asm $ASFLAGS -o conftest.o >conftest.log 2>&1], [
diff --git a/libass/Makefile.am b/libass/Makefile.am
index d3a47f7..207fe27 100644
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -12,7 +12,7 @@ nasm_verbose_ = $(nasm_verbose_$(AM_DEFAULT_VERBOSITY))
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)/ -o $@ $<
+ $(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