From 31bc8ba5cc9850cd77cba84e0932d11cd5607e5f Mon Sep 17 00:00:00 2001 From: 11rcombs Date: Sat, 25 Jan 2014 16:55:21 -0600 Subject: Added x86 ASM functions --- libass/Makefile.am | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'libass/Makefile.am') diff --git a/libass/Makefile.am b/libass/Makefile.am index 524d9a8..ddd5acf 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -6,6 +6,16 @@ LIBASS_LT_CURRENT = 5 LIBASS_LT_REVISION = 0 LIBASS_LT_AGE = 0 +.asm.lo: + $(LIBTOOL) --quiet --mode=compile $(AS) $(ASFLAGS) -o $@ $< -prefer-non-pic + +.S.lo: + $(LIBTOOL) --quiet --mode=compile $(AS) $(ASFLAGS)-o $@ $< -prefer-non-pic + +SRC_INTEL = x86/blend_bitmaps.asm x86/cpuid.asm +SRC_INTEL64 = x86/be_blur.asm +SRC_ARM = arm/blend_bitmaps.S + lib_LTLIBRARIES = libass.la libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontconfig.c ass_render.c \ ass_utils.c ass_bitmap.c ass_library.c ass_bitmap.h \ @@ -14,9 +24,45 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontconfig.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 + libass_la_LDFLAGS = -no-undefined -version-info $(LIBASS_LT_CURRENT):$(LIBASS_LT_REVISION):$(LIBASS_LT_AGE) libass_la_LDFLAGS += -export-symbols $(srcdir)/libass.sym +if ASM +if INTEL +AS = "yasm" +libass_la_SOURCES += $(SRC_INTEL) +if X86 +ASFLAGS += -DARCH_X86_64=0 -m x86 +if MACHO +ASFLAGS += -f macho32 -DPREFIX +endif +if ELF +ASFLAGS += -f elf +endif +if WIN32 +ASFLAGS += -f win32 -DPREFIX +endif +endif +if X64 +libass_la_SOURCES += $(SRC_INTEL64) +ASFLAGS += -DARCH_X86_64=1 -m amd64 +if MACHO +ASFLAGS += -f macho64 -DPREFIX +endif +if ELF +ASFLAGS += -f elf +endif +if WIN32 +ASFLAGS += -f win64 +endif +endif +endif +if ARM +libass_la_SOURCES += $(SRC_ARM) +endif +endif + assheadersdir = $(includedir)/ass dist_assheaders_HEADERS = ass.h ass_types.h -- cgit v1.2.3