walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove HAVE_OT 

We never tested compiling without it.  Just kill it.  We always build
our own shaper.
This commit is contained in:
Behdad Esfahbod 2018-10-10 16:32:35 -04:00
parent 7727e73756
commit 1e8fdd285f
10 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -97,7 +97,6 @@ include_directories(AFTER
${PROJECT_BINARY_DIR}/src ${PROJECT_BINARY_DIR}/src
) )
add_definitions(-DHAVE_OT)
add_definitions(-DHAVE_FALLBACK) add_definitions(-DHAVE_FALLBACK)
# We need PYTHON_EXECUTABLE to be set for running the tests... # We need PYTHON_EXECUTABLE to be set for running the tests...

6
configure.ac
View File

@ -148,12 +148,6 @@ AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread)
dnl ========================================================================== dnl ==========================================================================
have_ot=true
if $have_ot; then
AC_DEFINE(HAVE_OT, 1, [Have native OpenType Layout backend])
fi
AM_CONDITIONAL(HAVE_OT, $have_ot)
have_fallback=true have_fallback=true
if $have_fallback; then if $have_fallback; then
AC_DEFINE(HAVE_FALLBACK, 1, [Have simple TrueType Layout backend]) AC_DEFINE(HAVE_FALLBACK, 1, [Have simple TrueType Layout backend])

2
src/Makefile.am
View File

@ -29,11 +29,9 @@ HBSOURCES = $(HB_BASE_sources)
HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources) HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources)
HBHEADERS = $(HB_BASE_headers) HBHEADERS = $(HB_BASE_headers)
if HAVE_OT
HBSOURCES += $(HB_OT_sources) HBSOURCES += $(HB_OT_sources)
HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources) HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources)
HBHEADERS += $(HB_OT_headers) HBHEADERS += $(HB_OT_headers)
endif
if HAVE_FALLBACK if HAVE_FALLBACK
HBSOURCES += $(HB_FALLBACK_sources) HBSOURCES += $(HB_FALLBACK_sources)

2
src/hb-shaper-list.hh
View File

@ -39,9 +39,7 @@ HB_SHAPER_IMPLEMENT (graphite2)
HB_SHAPER_IMPLEMENT (coretext_aat) HB_SHAPER_IMPLEMENT (coretext_aat)
#endif #endif
#ifdef HAVE_OT
HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */ HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */
#endif
#ifdef HAVE_UNISCRIBE #ifdef HAVE_UNISCRIBE
HB_SHAPER_IMPLEMENT (uniscribe) HB_SHAPER_IMPLEMENT (uniscribe)

2
src/hb.hh
View File

@ -45,10 +45,8 @@
#include "hb.h" #include "hb.h"
#define HB_H_IN #define HB_H_IN
#ifdef HAVE_OT
#include "hb-ot.h" #include "hb-ot.h"
#define HB_OT_H_IN #define HB_OT_H_IN
#endif
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

4
test/api/Makefile.am
View File

@ -69,13 +69,12 @@ test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la $(ICU_LIBS)
endif endif
if HAVE_OT
TEST_PROGS += \ TEST_PROGS += \
test-ot-color \ test-ot-color \
test-ot-tag \ test-ot-tag \
$(NULL) $(NULL)
if HAVE_PTHREAD if HAVE_PTHREAD
if HAVE_FREETYPE if HAVE_FREETYPE
TEST_PROGS += test-multithread TEST_PROGS += test-multithread
@ -95,7 +94,6 @@ test_ot_math_LDADD = $(LDADD) $(FREETYPE_LIBS)
test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
endif # HAVE_FREETYPE endif # HAVE_FREETYPE
endif # HAVE_OT
# Tests for header compilation # Tests for header compilation
TEST_PROGS += \ TEST_PROGS += \

5
test/api/test-c.c
View File

@ -32,6 +32,7 @@
#endif #endif
#include <hb.h> #include <hb.h>
#include <hb-ot.h>
#ifdef HAVE_GLIB #ifdef HAVE_GLIB
#include <hb-glib.h> #include <hb-glib.h>
@ -45,10 +46,6 @@
#include <hb-ft.h> #include <hb-ft.h>
#endif #endif
#ifdef HAVE_OT
#include <hb-ot.h>
#endif
#ifdef HAVE_UNISCRIBE #ifdef HAVE_UNISCRIBE
#include <hb-uniscribe.h> #include <hb-uniscribe.h>
#endif #endif

4
util/Makefile.am
View File

@ -52,14 +52,11 @@ hb_subset_LDADD = \
$(top_builddir)/src/libharfbuzz-subset.la $(top_builddir)/src/libharfbuzz-subset.la
bin_PROGRAMS += hb-subset bin_PROGRAMS += hb-subset
if HAVE_OT
hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources) hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
bin_PROGRAMS += hb-ot-shape-closure bin_PROGRAMS += hb-ot-shape-closure
endif # HAVE_OT
endif # HAVE_GLIB endif # HAVE_GLIB
#if HAVE_OT
#if HAVE_FONTCONFIG #if HAVE_FONTCONFIG
#hb_fc_list_SOURCES = \ #hb_fc_list_SOURCES = \
# hb-fc.cc \ # hb-fc.cc \
@ -72,6 +69,5 @@ endif # HAVE_GLIB
# $(NULL) # $(NULL)
#bin_PROGRAMS += hb-fc-list #bin_PROGRAMS += hb-fc-list
#endif # HAVE_FONTCONFIG #endif # HAVE_FONTCONFIG
#endif # HAVE_OT
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

4
util/options.cc
View File

@ -29,9 +29,7 @@
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
#include <hb-ft.h> #include <hb-ft.h>
#endif #endif
#ifdef HAVE_OT
#include <hb-ot.h> #include <hb-ot.h>
#endif
static struct supported_font_funcs_t { static struct supported_font_funcs_t {
char name[4]; char name[4];
@ -41,9 +39,7 @@ static struct supported_font_funcs_t {
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
{"ft", hb_ft_font_set_funcs}, {"ft", hb_ft_font_set_funcs},
#endif #endif
#ifdef HAVE_OT
{"ot", hb_ot_font_set_funcs}, {"ot", hb_ot_font_set_funcs},
#endif
}; };

2
util/options.hh
View File

@ -46,9 +46,7 @@
#endif #endif
#include <hb.h> #include <hb.h>
#ifdef HAVE_OT
#include <hb-ot.h> #include <hb-ot.h>
#endif
#include <glib.h> #include <glib.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>