649 hidevf w_novirtualdescr arrowrtn2, \ |
649 hidevf w_novirtualdescr arrowrtn2, \ |
650 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
650 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
651 LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
651 LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
652 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
652 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
653 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
653 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
654 LDFLAGS_macosx := -undefined dynamic_lookup, \ |
|
655 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
654 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
656 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
655 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
657 LIBS_aix := -lawt_headless,\ |
656 LIBS_aix := -lawt_headless, \ |
|
657 LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ |
|
658 -framework CoreGraphics, \ |
658 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
659 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
659 $(WIN_AWT_LIB), \ |
660 $(WIN_AWT_LIB), \ |
660 )) |
661 )) |
661 |
662 |
662 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
663 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
663 |
664 |
664 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) |
665 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) |
665 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS) |
666 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS) |
|
667 endif |
|
668 |
|
669 ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
670 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_LWAWT) |
666 endif |
671 endif |
667 |
672 |
668 ifeq ($(FREETYPE_TO_USE), bundled) |
673 ifeq ($(FREETYPE_TO_USE), bundled) |
669 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE) |
674 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE) |
670 endif |
675 endif |