equal
deleted
inserted
replaced
42 $(call install-file) |
42 $(call install-file) |
43 |
43 |
44 ################################################################################ |
44 ################################################################################ |
45 |
45 |
46 ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) |
46 ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) |
47 # We need to bundle the freetype library, so it will be available at runtime as well as link time. |
47 # We need to bundle the freetype library, so it will be available at runtime |
|
48 # as well as link time. |
48 # |
49 # |
49 # NB: Default freetype build system uses -h linker option and |
50 # NB: Default freetype build system uses -h linker option and |
50 # result .so contains hardcoded library name that is later |
51 # result .so contains hardcoded library name that is later |
51 # used for adding dependencies to other objects |
52 # used for adding dependencies to other objects |
52 # (e.g. libfontmanager.so). |
53 # (e.g. libfontmanager.so). |
59 # but fortunately we need to load FreeType library explicitly |
60 # but fortunately we need to load FreeType library explicitly |
60 # on windows only |
61 # on windows only |
61 # |
62 # |
62 #TODO: rework this to avoid hardcoding library name in the makefile |
63 #TODO: rework this to avoid hardcoding library name in the makefile |
63 # |
64 # |
64 ifeq ($(OPENJDK_TARGET_OS), windows) |
65 ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris), ) |
|
66 FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype).6 |
|
67 else |
65 FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype) |
68 FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype) |
66 else |
|
67 FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype).6 |
|
68 endif |
69 endif |
69 |
70 |
70 # We can't use $(install-file) in this rule because it preserves symbolic links and |
71 # We can't use $(install-file) in this rule because it preserves symbolic links and |
71 # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix. |
72 # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix. |
72 $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) |
73 $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) |