summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-11 18:51:54 +0200
committerwm4 <wm4@nowhere>2015-07-11 19:04:17 +0200
commit109254ab11a2f49d4c25a59c08156647719faf4f (patch)
tree475dfcf2d6fe7d7c7cf99febbc65e6864a56e5f4
parent7d44f869492bc108a136700c5eb359fc16ff1548 (diff)
downloadlibass-109254ab11a2f49d4c25a59c08156647719faf4f.tar.bz2
libass-109254ab11a2f49d4c25a59c08156647719faf4f.tar.xz
directwrite: compile only on Windows
-rw-r--r--configure.ac1
-rw-r--r--libass/Makefile.am8
-rw-r--r--libass/ass_directwrite.cpp4
-rw-r--r--libass/ass_directwrite.h4
4 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index f07d739..26c2c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,6 +199,7 @@ AC_LINK_IFELSE([
])
AC_LANG_POP([C++])
fi
+AM_CONDITIONAL([DIRECTWRITE], [test x$directwrite = xtrue])
if test x$enable_harfbuzz != xno; then
PKG_CHECK_MODULES([HARFBUZZ], harfbuzz >= 0.9.5, [
diff --git a/libass/Makefile.am b/libass/Makefile.am
index 3e35cf6..4e266f1 100644
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -19,6 +19,8 @@ SRC_INTEL_RASTERIZER = x86/rasterizer.asm
SRC_RASTERIZER = ass_rasterizer.h ass_rasterizer.c ass_rasterizer_c.c
+SRC_DIRECTWRITE = ass_directwrite.cpp ass_directwrite.h
+
lib_LTLIBRARIES = libass.la
libass_la_SOURCES = ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c \
ass_utils.c ass_bitmap.c ass_blur.c ass_library.c ass_bitmap.h \
@@ -27,11 +29,15 @@ 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_directwrite.cpp ass_directwrite.h
+ ass_coretext.c ass_coretext.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
+if DIRECTWRITE
+libass_la_SOURCES += $(SRC_DIRECTWRITE)
+endif
+
if RASTERIZER
libass_la_SOURCES += $(SRC_RASTERIZER)
endif
diff --git a/libass/ass_directwrite.cpp b/libass/ass_directwrite.cpp
index 0295f0d..37e1cc8 100644
--- a/libass/ass_directwrite.cpp
+++ b/libass/ass_directwrite.cpp
@@ -18,8 +18,6 @@
#include "config.h"
-#ifdef CONFIG_DIRECTWRITE
-
#include <dwrite.h>
extern "C" {
@@ -611,5 +609,3 @@ ASS_FontProvider *ass_directwrite_add_provider(ASS_Library *lib,
return provider;
}
-
-#endif
diff --git a/libass/ass_directwrite.h b/libass/ass_directwrite.h
index 054ea6b..daf17ff 100644
--- a/libass/ass_directwrite.h
+++ b/libass/ass_directwrite.h
@@ -24,12 +24,8 @@
#ifndef ASS_DIRECTWRITE_H
#define ASS_DIRECTWRITE_H
-#ifdef CONFIG_DIRECTWRITE
-
ASS_FontProvider *
ass_directwrite_add_provider(ASS_Library *lib, ASS_FontSelector *selector,
const char *config);
#endif
-
-#endif