make/lib/Awt2dLibraries.gmk

*** 504,513 ****
--- 504,515 ----
  
    # For use by libfontmanager:
    LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS)
    ifeq ($(call isTargetOs, windows), true)
      LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
+   # freetype now requires you to manually define this (see ftconfig.h)
+   BUILD_LIBFREETYPE_CFLAGS += -DDLL_EXPORT
    else
      LIBFREETYPE_LIBS := -lfreetype
    endif
  
    $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
*** 517,528 ****
            $(BUILD_LIBFREETYPE_CFLAGS), \
        EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
        DISABLED_WARNINGS_solstudio := \
           E_STATEMENT_NOT_REACHED \
           E_END_OF_LOOP_CODE_NOT_REACHED, \
!       DISABLED_WARNINGS_microsoft := 4267 4244 4312 4819, \
!       DISABLED_WARNINGS_gcc := implicit-fallthrough, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
    ))
  
    TARGETS += $(BUILD_LIBFREETYPE)
--- 519,530 ----
            $(BUILD_LIBFREETYPE_CFLAGS), \
        EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
        DISABLED_WARNINGS_solstudio := \
           E_STATEMENT_NOT_REACHED \
           E_END_OF_LOOP_CODE_NOT_REACHED, \
!       DISABLED_WARNINGS_microsoft := 4018 4267 4244 4312 4819, \
!       DISABLED_WARNINGS_gcc := implicit-fallthrough cast-function-type bad-function-cast, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
    ))
  
    TARGETS += $(BUILD_LIBFREETYPE)