make/lib/Awt2dLibraries.gmk
changeset 48032 9240097e2821
parent 47507 5a270d2dfa5d
child 48040 26f1193f1348
equal deleted inserted replaced
48031:d0cf025a5e79 48032:9240097e2821
   656   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   656   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   657 endif
   657 endif
   658 
   658 
   659 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
   659 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
   660     LIBRARY := fontmanager, \
   660     LIBRARY := fontmanager, \
   661     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   661     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
   662     SRC := $(LIBFONTMANAGER_SRC), \
   662     SRC := $(LIBFONTMANAGER_SRC), \
   663     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   663     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   664         AccelGlyphCache.c, \
   664         AccelGlyphCache.c, \
   665     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   665     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   666     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   666     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   706 
   706 
   707 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   707 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   708   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
   708   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
   709 endif
   709 endif
   710 
   710 
   711 TARGETS += $(BUILD_LIBFONTMANAGER)
   711 $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
       
   712 	$(install-file)
       
   713         ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
       
   714           ifeq ($(OPENJDK_TARGET_OS), macosx)
       
   715             # If bundling freetype on macosx, we need to rewrite the rpath location
       
   716             # in the libfontmanager library to point to the bundled location
       
   717 	    $(INSTALL_NAME_TOOL) -change \
       
   718 	        `$(OTOOL) -D $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) | $(TAIL) -n1` \
       
   719 	        '@rpath/$(call SHARED_LIBRARY,freetype)' \
       
   720 	        $@
       
   721           endif
       
   722         endif
       
   723 
       
   724 TARGETS += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
   712 
   725 
   713 ################################################################################
   726 ################################################################################
   714 
   727 
   715 ifeq ($(OPENJDK_TARGET_OS), windows)
   728 ifeq ($(OPENJDK_TARGET_OS), windows)
   716   LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
   729   LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt