597 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
597 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
598 |
598 |
599 #### End harfbuzz configuration |
599 #### End harfbuzz configuration |
600 |
600 |
601 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) |
601 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) |
602 # This may be overridden in a custom makefile |
|
603 BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers |
|
604 BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS) |
602 BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS) |
605 |
603 |
606 LIBFONTMANAGER_OPTIMIZATION := HIGH |
604 LIBFONTMANAGER_OPTIMIZATION := HIGH |
607 |
605 |
608 ifeq ($(OPENJDK_TARGET_OS), windows) |
606 ifeq ($(OPENJDK_TARGET_OS), windows) |
654 E_ENUM_VAL_OVERFLOWS_INT_MAX, \ |
652 E_ENUM_VAL_OVERFLOWS_INT_MAX, \ |
655 DISABLED_WARNINGS_CXX_solstudio := \ |
653 DISABLED_WARNINGS_CXX_solstudio := \ |
656 truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ |
654 truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ |
657 hidevf w_novirtualdescr arrowrtn2, \ |
655 hidevf w_novirtualdescr arrowrtn2, \ |
658 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
656 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
659 MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
|
660 LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
657 LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
661 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
658 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
662 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
659 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
663 LDFLAGS_macosx := -undefined dynamic_lookup, \ |
660 LDFLAGS_macosx := -undefined dynamic_lookup, \ |
664 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
661 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |