diff options
| author | Dmitry Batrak <Dmitry.Batrak@jetbrains.com> | 2016-08-03 16:19:43 +0300 |
|---|---|---|
| committer | Dmitry Batrak <Dmitry.Batrak@jetbrains.com> | 2016-08-03 16:19:43 +0300 |
| commit | 14b183ce63fb5c44357cbeae4adcd179bc5ed1bb (patch) | |
| tree | 07de0be371119e9df1f4584021e0cba5708608ff /make | |
| parent | 2843de1556c161521d9663344290e8cc71e7d70b (diff) | |
| download | jdk8u_jdk-14b183ce63fb5c44357cbeae4adcd179bc5ed1bb.tar.gz | |
JRE-11 Support text rendering via DirectWrite API on Windows - initial versionjb8u112-b283
Diffstat (limited to 'make')
| -rw-r--r-- | make/lib/Awt2dLibraries.gmk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk index 34c3d38c3a..ff7af4605d 100644 --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -906,10 +906,12 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx) LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ X11TextRenderer.c \ fontpath.c \ - lcdglyph.c + lcdglyph.c \ + lcdglyphDW.cpp else LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ - lcdglyph.c + lcdglyph.c \ + lcdglyphDW.cpp endif BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \ @@ -954,7 +956,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ -ljava -ljvm, \ - LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ + LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib Dwrite.lib \ $(WIN_AWT_LIB), \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ |