stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8001922: Improve freetype handling

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2013-10-23 13:06:37 +02:00
parent ce42afa263
commit e4ff601011
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/makefiles/CopyFiles.gmk
View File

@ -215,7 +215,8 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES)
########################################################################################## ##########################################################################################
# make sure freetype dll will be available at runtime as well as link time ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
# We need to bundle the freetype library, so it will be available at runtime as well as link time.
# #
# NB: Default freetype build system uses -h linker option and # NB: Default freetype build system uses -h linker option and
# result .so contains hardcoded library name that is later # result .so contains hardcoded library name that is later
@ -232,22 +233,19 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES)
# #
#TODO: rework this to avoid hardcoding library name in the makefile #TODO: rework this to avoid hardcoding library name in the makefile
# #
ifdef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
else else
ifeq ($(USING_SYSTEM_FT_LIB), false) FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
endif
endif endif
$(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
$(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ $(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
ifeq ($(OPENJDK_BUILD_OS), windows) ifeq ($(OPENJDK_BUILD_OS), windows)
$(CHMOD) +rx $@ $(CHMOD) +rx $@
endif endif
COPY_FILES += $(FREETYPE_LIB) COPY_FILES += $(FREETYPE_TARGET_LIB)
endif endif
########################################################################################## ##########################################################################################

4
jdk/makefiles/lib/Awt2dLibraries.gmk
View File

@ -780,9 +780,9 @@ ifndef OPENJDK
BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
else else
FONT_HEADERS := $(FREETYPE2_CFLAGS) FONT_HEADERS := $(FREETYPE_CFLAGS)
BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE2_LIBS) BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
endif endif
LIBFONTMANAGER_OPTIMIZATION := HIGH LIBFONTMANAGER_OPTIMIZATION := HIGH