equal
deleted
inserted
replaced
620 HARFBUZZ_CFLAGS += -DHAVE_CORETEXT |
620 HARFBUZZ_CFLAGS += -DHAVE_CORETEXT |
621 endif |
621 endif |
622 ifneq ($(OPENJDK_TARGET_OS), macosx) |
622 ifneq ($(OPENJDK_TARGET_OS), macosx) |
623 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc |
623 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc |
624 endif |
624 endif |
625 ifndef OPENJDK |
625 # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. |
626 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc |
626 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc |
627 endif |
|
628 |
627 |
629 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
628 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
630 |
629 |
631 #### End harfbuzz configuration |
630 #### End harfbuzz configuration |
632 |
631 |