directwrite: compile only on Windows

diff --git a/configure.ac b/configure.ac
index f07d739b533a257c3151bfd6e8a415d8eabdb22e..26c2c3776af2212e8541cb9e32f900904a700e92 100644 (file)
--- 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 3e35cf661e336c7c1b118a5483de21f00741e601..4e266f1805b7a322c47461da44c0c56cab2807bc 100644 (file)
--- 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 0295f0dfac564268295e098b995512a3ef722fd4..37e1cc8dcb34f060e447c0f2f98863ca73b1b2ad 100644 (file)
--- 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 054ea6b48a3b2dcab2d54ff215ab3a313f8bbfee..daf17ffe8716392ee0bf9c808666c11c5f10baf1 100644 (file)
--- 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