diff options
author | wm4 <wm4@nowhere> | 2015-08-28 15:39:32 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-08-28 15:42:32 +0200 |
commit | 22d100831e59eeb572d316bf110f5ead8cfe9a2f (patch) | |
tree | 66df6ed8146ef0a02d3c106de8a03c241a602964 /libass/Makefile.am | |
parent | cde3b40bce6b544d9f4a9fa695f316bae5aaa84f (diff) | |
download | libass-22d100831e59eeb572d316bf110f5ead8cfe9a2f.tar.bz2 libass-22d100831e59eeb572d316bf110f5ead8cfe9a2f.tar.xz |
configure: proper configure switches for DirectWrite and CoreText
Also, remove the ass_coretext.c conditional compilation hack, and fix
Makefile.am instead.
Diffstat (limited to 'libass/Makefile.am')
-rw-r--r-- | libass/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libass/Makefile.am b/libass/Makefile.am index b6965c9..2cf6354 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -20,6 +20,7 @@ SRC_INTEL_RASTERIZER = x86/rasterizer.asm SRC_RASTERIZER = ass_rasterizer.h ass_rasterizer.c ass_rasterizer_c.c SRC_DIRECTWRITE = ass_directwrite.c ass_directwrite.h dwrite_c.h +SRC_CORETEXT = ass_coretext.c ass_coretext.h lib_LTLIBRARIES = libass.la libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \ @@ -28,8 +29,7 @@ libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \ ass_library.h ass_types.h ass_utils.h ass_drawing.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_shaper.h ass_strtod.c ass_fontconfig.c ass_fontconfig.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 @@ -38,6 +38,10 @@ if DIRECTWRITE libass_la_SOURCES += $(SRC_DIRECTWRITE) endif +if CORETEXT +libass_la_SOURCES += $(SRC_CORETEXT) +endif + if RASTERIZER libass_la_SOURCES += $(SRC_RASTERIZER) endif |