comparison make/Import.gmk @ 13220:a8e9ad77ac81

8073320: Windows HiDPI Graphics support Reviewed-by: flar, serb
author alexsch
date Fri, 13 Nov 2015 05:02:26 -0800
parents 8f3abc62ebdc
children 55573c377d64
comparison
equal deleted inserted replaced
6:b21141a86b58 7:50939a1e88fd
30 30
31 ################################################################################ 31 ################################################################################
32 32
33 # Put the libraries here. Different locations for different target OS types. 33 # Put the libraries here. Different locations for different target OS types.
34 ifneq ($(OPENJDK_TARGET_OS), windows) 34 ifneq ($(OPENJDK_TARGET_OS), windows)
35 HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR) 35 HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
36 BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) 36 BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)
37 SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent$(OPENJDK_TARGET_CPU_LIBDIR) 37 SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent$(OPENJDK_TARGET_CPU_LIBDIR)
38 else 38 else
39 HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin 39 HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/bin
40 BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base 40 BASE_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
41 SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent 41 SA_INSTALL_LIBRARIES_HERE := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.hotspot.agent
42 endif 42 endif
43 43
44 ################################################################################ 44 ################################################################################
78 SA_TARGETS := $(COPY_HOTSPOT_SA) 78 SA_TARGETS := $(COPY_HOTSPOT_SA)
79 79
80 ################################################################################ 80 ################################################################################
81 81
82 ifeq ($(OPENJDK_TARGET_OS), macosx) 82 ifeq ($(OPENJDK_TARGET_OS), macosx)
83 JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \ 83 JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
84 $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) ) 84 $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
85 else 85 else
86 JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \ 86 JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
87 $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) ) 87 $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
88 endif 88 endif
89 89
90 ifneq ($(OPENJDK_TARGET_OS), windows) 90 ifneq ($(OPENJDK_TARGET_OS), windows)
91 ifeq ($(JVM_VARIANT_SERVER), true) 91 ifeq ($(JVM_VARIANT_SERVER), true)
92 BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) 92 BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)