diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | libass/Makefile.am | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 358349c..a044833 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,7 @@ AC_INIT(libass, 0.12.3) AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([m4]) -# Disable C++/Fortran checks -define([AC_LIBTOOL_LANG_CXX_CONFIG], [:]) +# Disable Fortran checks define([AC_LIBTOOL_LANG_F77_CONFIG], [:]) LT_INIT AC_CONFIG_SRCDIR([libass/ass.c]) @@ -196,7 +195,7 @@ AC_LINK_IFELSE([ directwrite=false AC_MSG_RESULT([no]) ]) -AC_LANG_POP() +AC_LANG_POP([C++]) fi if test x$enable_harfbuzz != xno; then diff --git a/libass/Makefile.am b/libass/Makefile.am index 6854768..3e35cf6 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -11,7 +11,7 @@ yasm_verbose_ = $(yasm_verbose_$(AM_DEFAULT_VERBOSITY)) yasm_verbose_0 = @echo " YASM " $@; .asm.lo: - $(yasm_verbose)$(LIBTOOL) $(AM_V_lt) --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic + $(yasm_verbose)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic SRC_INTEL = x86/blend_bitmaps.asm x86/blur.asm x86/cpuid.asm x86/cpuid.h SRC_INTEL64 = x86/be_blur.asm @@ -27,7 +27,7 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \ ass_drawing.h ass_cache_template.h ass_render.h \ ass_parse.c ass_parse.h ass_render_api.c ass_shaper.c \ ass_shaper.h ass_strtod.c ass_fontconfig.c ass_fontconfig.h \ - ass_coretext.c ass_coretext.h + ass_coretext.c ass_coretext.h ass_directwrite.cpp ass_directwrite.h libass_la_LDFLAGS = -no-undefined -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym |