author | naoto |
Thu, 19 Jul 2018 11:15:38 -0700 | |
changeset 51169 | 0058ffa0a922 |
parent 50826 | f5b95be8b6e2 |
child 51387 | 9fe4fc157f4e |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
47314 | 26 |
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk)) |
39504
96c700e62710
8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents:
39025
diff
changeset
|
27 |
|
27565 | 28 |
WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
30 |
LIBAWT_DEFAULT_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
31 |
libawt/awt/image \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
32 |
libawt/awt/image/cvutils \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
33 |
libawt/java2d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
34 |
libawt/java2d/loops \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
35 |
libawt/java2d/pipe \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
36 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
37 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
38 |
################################################################################ |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
39 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
40 |
# We must not include java.desktop/unix/native/libmlib_image, which is only |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
41 |
# for usage by solaris-sparc in libmlib_image_v. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
42 |
BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix |
20547 | 43 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
44 |
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH |
13702 | 45 |
|
46 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
|
20547 | 47 |
BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
12892 | 48 |
endif |
49 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
50 |
$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
51 |
NAME := mlib_image, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
52 |
EXTRA_SRC := common/awt/medialib, \ |
25859 | 53 |
EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
54 |
EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \ |
20547 | 55 |
OPTIMIZATION := HIGHEST, \ |
56 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
57 |
$(BUILD_LIBMLIB_CFLAGS), \ |
|
58 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
|
59 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
60 |
LIBS := $(JDKLIB_LIBS), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
61 |
LIBS_unix := $(LIBM) $(LIBDL), \ |
35276 | 62 |
)) |
20547 | 63 |
|
27565 | 64 |
$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java) |
13164 | 65 |
|
27565 | 66 |
TARGETS += $(BUILD_LIBMLIB_IMAGE) |
12892 | 67 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
68 |
################################################################################ |
12892 | 69 |
|
20547 | 70 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |
71 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
72 |
# libmlib_image_v is basically built from mlib_image sources, with some additions |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
73 |
# and some exclusions. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
74 |
LIBMLIB_IMAGE_V_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
75 |
libmlib_image \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
76 |
common/awt/medialib \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
77 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
78 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
79 |
LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
80 |
$(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
81 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
82 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
83 |
LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
84 |
endif |
20547 | 85 |
|
25859 | 86 |
BUILD_LIBMLIB_IMAGE_V_EXFILES := \ |
87 |
awt_ImagingLib.c \ |
|
88 |
mlib_c_ImageAffine_BC.c \ |
|
89 |
mlib_c_ImageAffine_BC_S16.c \ |
|
90 |
mlib_c_ImageAffine_BC_U16.c \ |
|
91 |
mlib_c_ImageAffine_BL.c \ |
|
92 |
mlib_c_ImageAffine_BL_S16.c \ |
|
93 |
mlib_c_ImageAffine_BL_U16.c \ |
|
94 |
mlib_c_ImageAffine_NN.c \ |
|
95 |
mlib_c_ImageConvClearEdge.c \ |
|
96 |
mlib_c_ImageConvCopyEdge.c \ |
|
97 |
mlib_c_ImageConv_f.c \ |
|
98 |
mlib_c_ImageConvVersion.c \ |
|
99 |
mlib_c_ImageCopy.c \ |
|
100 |
mlib_c_ImageLookUp.c \ |
|
101 |
mlib_c_ImageLookUp_f.c \ |
|
102 |
# |
|
103 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
104 |
$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
105 |
NAME := mlib_image_v, \ |
25859 | 106 |
SRC := $(LIBMLIB_IMAGE_V_SRC), \ |
107 |
EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \ |
|
20547 | 108 |
OPTIMIZATION := HIGHEST, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
109 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
110 |
$(LIBMLIB_IMAGE_V_CFLAGS), \ |
20547 | 111 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
112 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
113 |
LIBS := -ljava -ljvm $(LIBM) $(LIBDL), \ |
35276 | 114 |
)) |
20547 | 115 |
|
27565 | 116 |
$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java) |
20547 | 117 |
|
27565 | 118 |
TARGETS += $(BUILD_LIBMLIB_IMAGE_V) |
12892 | 119 |
|
120 |
endif |
|
121 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
122 |
################################################################################ |
12892 | 123 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
124 |
LIBAWT_EXTRA_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
125 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
126 |
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
25859 | 127 |
# |
20547 | 128 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
129 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
130 |
LIBAWT_EXTRA_SRC += $(TOPDIR)/src/$(MODULE)/share/native/common/awt/medialib |
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
131 |
endif |
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
132 |
|
20547 | 133 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
134 |
LIBAWT_EXTRA_SRC += \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
135 |
$(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
136 |
$(TOPDIR)/src/$(MODULE)/share/native/common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
137 |
$(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
138 |
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
139 |
# |
25859 | 140 |
endif |
141 |
||
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
142 |
ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
25859 | 143 |
LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
14231 | 144 |
endif |
13164 | 145 |
|
25859 | 146 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
147 |
LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c |
22597
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
22595
diff
changeset
|
148 |
endif |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
22595
diff
changeset
|
149 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
150 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
151 |
LIBAWT_EXFILES += \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
152 |
java2d/d3d/D3DShaderGen.c \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
153 |
awt/image/cvutils/img_colors.c \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
154 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
155 |
endif |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
156 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
157 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
158 |
LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
159 |
else |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
160 |
LIBAWT_EXCLUDES += \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
161 |
$(TOPDIR)/src/$(MODULE)/unix/native/libawt/awt/medialib \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
162 |
$(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
163 |
$(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
164 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
165 |
endif |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
166 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
167 |
LIBAWT_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
168 |
$(LIBAWT_DEFAULT_HEADER_DIRS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
169 |
$(call GetJavaHeaderDir, java.base) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
170 |
libawt/awt/medialib \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
171 |
libawt/java2d/d3d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
172 |
libawt/java2d/opengl \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
173 |
libawt/java2d/windows \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
174 |
libawt/windows \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
175 |
common/awt/medialib \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
176 |
libmlib_image \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
177 |
include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
178 |
java.base:libjava \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
179 |
java.base:include \ |
25859 | 180 |
# |
181 |
||
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
182 |
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS) |
20547 | 183 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
184 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
185 |
LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
186 |
$(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il |
20547 | 187 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
188 |
LIBAWT_ASFLAGS = -P -xarch=v9a |
12892 | 189 |
endif |
190 |
||
20547 | 191 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
192 |
LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH |
|
12892 | 193 |
endif |
194 |
||
20547 | 195 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
196 |
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE |
|
197 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
|
198 |
LIBAWT_CFLAGS += -DMLIB_OS64BIT |
|
199 |
endif |
|
200 |
||
47217 | 201 |
LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
202 |
LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc |
12892 | 203 |
endif |
204 |
||
20547 | 205 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
49440 | 206 |
# FIXME: This is probably not what we want to do, but keep it now for compatibility. |
207 |
LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS) |
|
12892 | 208 |
endif |
209 |
||
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
210 |
# Turn off all warnings for debug_mem.c This is needed because the specific warning |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
211 |
# about initializing a declared 'extern' cannot be turned off individually. Only |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
212 |
# applies to debug builds. |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
213 |
ifeq ($(TOOLCHAIN_TYPE), gcc) |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
214 |
BUILD_LIBAWT_debug_mem.c_CFLAGS := -w |
43082
cf17b8a17dc0
8140266: Performance loss between jdk8 and jdk9 on Maskfill
serb
parents:
42747
diff
changeset
|
215 |
# This option improves performance of MaskFill in Java2D by 20% for some gcc |
cf17b8a17dc0
8140266: Performance loss between jdk8 and jdk9 on Maskfill
serb
parents:
42747
diff
changeset
|
216 |
LIBAWT_CFLAGS += -fgcse-after-reload |
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
217 |
endif |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
218 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
219 |
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
220 |
NAME := awt, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
221 |
EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \ |
25859 | 222 |
EXCLUDES := $(LIBAWT_EXCLUDES), \ |
223 |
EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
|
20547 | 224 |
OPTIMIZATION := LOW, \ |
225 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
226 |
EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
227 |
DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
228 |
format-nonliteral parentheses, \ |
30434 | 229 |
DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
230 |
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
50484
f8c15a2f2ae9
8204211: windows : handle potential C++ exception in GDIRenderer
mbaesken
parents:
50479
diff
changeset
|
231 |
DISABLED_WARNINGS_microsoft := 4244 4267 4996, \ |
20547 | 232 |
ASFLAGS := $(LIBAWT_ASFLAGS), \ |
233 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
33406 | 234 |
LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \ |
235 |
LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \ |
|
236 |
-delayload:shell32.dll -delayload:winmm.dll \ |
|
237 |
-delayload:winspool.drv -delayload:imm32.dll \ |
|
238 |
-delayload:ole32.dll -delayload:comdlg32.dll \ |
|
239 |
-delayload:comctl32.dll -delayload:shlwapi.dll, \ |
|
240 |
LIBS_unix := -ljvm -ljava $(LIBM), \ |
|
241 |
LIBS_linux := $(LIBDL), \ |
|
49241 | 242 |
LIBS_solaris := $(LIBDL), \ |
33406 | 243 |
LIBS_aix := $(LIBDL),\ |
244 |
LIBS_macosx := -lmlib_image \ |
|
20547 | 245 |
-framework Cocoa \ |
246 |
-framework OpenGL \ |
|
247 |
-framework JavaNativeFoundation \ |
|
248 |
-framework JavaRuntimeSupport \ |
|
249 |
-framework ApplicationServices \ |
|
33406 | 250 |
-framework AudioToolbox, \ |
251 |
LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ |
|
20547 | 252 |
imm32.lib ole32.lib uuid.lib shell32.lib \ |
253 |
comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \ |
|
33406 | 254 |
delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \ |
20547 | 255 |
VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \ |
256 |
RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \ |
|
257 |
-D "JDK_FNAME=awt.dll" \ |
|
258 |
-D "JDK_INTERNAL_NAME=awt" \ |
|
259 |
-D "JDK_FTYPE=0x2L", \ |
|
35276 | 260 |
)) |
20547 | 261 |
|
27565 | 262 |
$(BUILD_LIBAWT): $(call FindLib, java.base, java) |
13164 | 263 |
|
264 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
20547 | 265 |
$(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE) |
13164 | 266 |
endif |
267 |
||
27565 | 268 |
TARGETS += $(BUILD_LIBAWT) |
12892 | 269 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
270 |
################################################################################ |
12892 | 271 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
272 |
ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), ) |
41132 | 273 |
ifeq ($(ENABLE_HEADLESS_ONLY), false) |
20547 | 274 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
275 |
LIBAWT_XAWT_EXTRA_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
276 |
common/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
277 |
common/java2d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
278 |
common/font \ |
25859 | 279 |
# |
280 |
||
281 |
LIBAWT_XAWT_EXCLUDES := medialib |
|
20547 | 282 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
283 |
LIBAWT_XAWT_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
284 |
$(LIBAWT_DEFAULT_HEADER_DIRS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
285 |
libawt_xawt/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
286 |
include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
287 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
288 |
common/awt/systemscale \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
289 |
common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
290 |
common/java2d/opengl \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
291 |
common/java2d/x11 \ |
25859 | 292 |
# |
293 |
||
294 |
LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
|
21130 | 295 |
-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
47507
5a270d2dfa5d
8170681: Remove fontconfig header files from JDK source tree
prr
parents:
47314
diff
changeset
|
296 |
$(FONTCONFIG_CFLAGS) \ |
25859 | 297 |
$(CUPS_CFLAGS) |
20547 | 298 |
|
299 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
300 |
LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
|
301 |
endif |
|
302 |
||
303 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
|
304 |
ifeq ($(DISABLE_XRENDER), true) |
|
305 |
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true |
|
306 |
endif |
|
307 |
endif |
|
308 |
||
49241 | 309 |
LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm |
20547 | 310 |
|
311 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
|
33406 | 312 |
LIBAWT_XAWT_LIBS += -lpthread |
20547 | 313 |
endif |
314 |
||
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
315 |
ifeq ($(TOOLCHAIN_TYPE), gcc) |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
316 |
# Turn off all warnings for the following files since they contain warnings |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
317 |
# that cannot be turned of individually. |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
318 |
# redefining a macro |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
319 |
BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
320 |
# comparison between pointer and integer |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
321 |
BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
322 |
# initializing a declared 'extern' |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
323 |
BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
50350
668463f93ec0
8201429: Support AIX Input Method Editor (IME) for AWT Input Method Framework (IMF)
clanger
parents:
49999
diff
changeset
|
324 |
endif |
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
325 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
326 |
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
327 |
NAME := awt_xawt, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
328 |
EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
329 |
EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \ |
25859 | 330 |
EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \ |
20547 | 331 |
OPTIMIZATION := LOW, \ |
332 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
|
333 |
$(X_CFLAGS), \ |
|
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
36110
diff
changeset
|
334 |
WARNINGS_AS_ERRORS_xlc := false, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
335 |
DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ |
42194
4c928df88d20
8160146: Resolve disabled GCC warning 'deprecated-declarations' for libawt_xawt
aghaisas
parents:
41132
diff
changeset
|
336 |
unused-result maybe-uninitialized format \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
337 |
format-security int-to-pointer-cast parentheses \ |
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
338 |
implicit-fallthrough, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
339 |
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
340 |
E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ |
20547 | 341 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
342 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
|
27944 | 343 |
-L$(INSTALL_LIBRARIES_HERE), \ |
33406 | 344 |
LIBS := $(X_LIBS) $(LIBAWT_XAWT_LIBS), \ |
35276 | 345 |
)) |
20547 | 346 |
|
27565 | 347 |
$(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java) |
20547 | 348 |
|
349 |
$(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT) |
|
350 |
||
27565 | 351 |
TARGETS += $(BUILD_LIBAWT_XAWT) |
20547 | 352 |
|
353 |
endif |
|
354 |
endif |
|
355 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
356 |
################################################################################ |
20547 | 357 |
|
33285 | 358 |
# The fast floor code loses precision. |
359 |
LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR |
|
24540 | 360 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
361 |
LCMS_CFLAGS_JDKLIB := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
362 |
|
24540 | 363 |
ifeq ($(USE_EXTERNAL_LCMS), true) |
364 |
# If we're using an external library, we'll just need the wrapper part. |
|
42352
4036fe6d110d
8039103: "explicitly" is misspelled as "explicitely" in configure scripts
ihse
parents:
42340
diff
changeset
|
365 |
# By including it explicitly, all other files will be excluded. |
24540 | 366 |
BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
367 |
# If we're using an external library, we can't include our own SRC path |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
368 |
# as includes, instead the system headers should be used. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
369 |
LIBLCMS_HEADERS_FROM_SRC := false |
24540 | 370 |
else |
371 |
BUILD_LIBLCMS_INCLUDE_FILES := |
|
372 |
endif |
|
373 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
374 |
$(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
375 |
NAME := lcms, \ |
24540 | 376 |
INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
20547 | 377 |
OPTIMIZATION := HIGHEST, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
378 |
CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
24540 | 379 |
$(LCMS_CFLAGS), \ |
20547 | 380 |
CFLAGS_solaris := -xc99=no_lib, \ |
381 |
CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
382 |
EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
383 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
384 |
libawt/java2d, \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
385 |
HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
39550
8d587cab45d2
8160294: Some client libraries cannot be built with GCC 6
ysuenaga
parents:
39025
diff
changeset
|
386 |
DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
387 |
DISABLED_WARNINGS_clang := tautological-compare, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
388 |
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
42747
807791cafb87
8170954: non-ASCII characters in lcms and harfbuzz break Windows builds on some locales
dbuck
parents:
42352
diff
changeset
|
389 |
DISABLED_WARNINGS_microsoft := 4819, \ |
20547 | 390 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
391 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
27944 | 392 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
49640
dd76fcbda95f
8200383: Can't build on SPARC Hotspot with code which use math functions
kvn
parents:
49263
diff
changeset
|
393 |
LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \ |
33406 | 394 |
LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
35276 | 395 |
)) |
20547 | 396 |
|
27565 | 397 |
TARGETS += $(BUILD_LIBLCMS) |
20547 | 398 |
|
399 |
$(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
|
400 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
401 |
################################################################################ |
20547 | 402 |
|
49440 | 403 |
# "DISABLED_WARNINGS_gcc := clobbered" rationale: |
20547 | 404 |
# Suppress gcc warnings like "variable might be clobbered by 'longjmp' |
405 |
# or 'vfork'": this warning indicates that some variable is placed to |
|
406 |
# a register by optimized compiler and it's value might be lost on longjmp(). |
|
407 |
# Recommended way to avoid such warning is to declare the variable as |
|
408 |
# volatile to prevent the optimization. However, this approach does not |
|
409 |
# work because we have to declare all variables as volatile in result. |
|
410 |
||
25103 | 411 |
ifeq ($(USE_EXTERNAL_LIBJPEG), true) |
412 |
LIBJPEG_LIBS := -ljpeg |
|
413 |
BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ |
|
33647
2665054d3864
8139932: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg]
omajid
parents:
33518
diff
changeset
|
414 |
imageioJPEG.c \ |
25103 | 415 |
jpegdecoder.c |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
416 |
# If we're using an external library, we can't include our own SRC path |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
417 |
# as includes, instead the system headers should be used. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
418 |
LIBJPEG_HEADERS_FROM_SRC := false |
25103 | 419 |
else |
420 |
LIBJPEG_LIBS := |
|
421 |
BUILD_LIBJAVAJPEG_INCLUDE_FILES := |
|
422 |
endif |
|
423 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
424 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
425 |
NAME := javajpeg, \ |
25103 | 426 |
INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
20547 | 427 |
OPTIMIZATION := HIGHEST, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
428 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
429 |
HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
430 |
DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ |
33305
ed708a0e3482
8140223: fix the build with a toolchain with a linker defaulting to ld --as-needed
erikj
parents:
33285
diff
changeset
|
431 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
20547 | 432 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
33406 | 433 |
LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
434 |
LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
|
35276 | 435 |
)) |
20547 | 436 |
|
27565 | 437 |
$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java) |
20547 | 438 |
|
27565 | 439 |
TARGETS += $(BUILD_LIBJAVAJPEG) |
20547 | 440 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
441 |
################################################################################ |
20547 | 442 |
|
41132 | 443 |
# Mac and Windows only use the native AWT lib, do not build libawt_headless |
444 |
ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) |
|
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
445 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
446 |
LIBAWT_HEADLESS_EXTRA_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
447 |
common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
448 |
common/java2d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
449 |
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
41132 | 450 |
# |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
451 |
|
41132 | 452 |
LIBAWT_HEADLESS_EXCLUDES := medialib |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
453 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
454 |
LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
455 |
$(LIBAWT_DEFAULT_HEADER_DIRS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
456 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
457 |
common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
458 |
common/java2d/opengl \ |
41132 | 459 |
# |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
460 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
461 |
LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
462 |
-DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
463 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
464 |
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
465 |
NAME := awt_headless, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
466 |
EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
41132 | 467 |
EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
468 |
OPTIMIZATION := LOW, \ |
|
469 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
470 |
$(LIBAWT_HEADLESS_CFLAGS), \ |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
471 |
EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \ |
41132 | 472 |
DISABLED_WARNINGS_xlc := 1506-356, \ |
473 |
DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \ |
|
474 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
|
475 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
476 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
|
477 |
LIBS_unix := -lawt -ljvm -ljava, \ |
|
478 |
LIBS_linux := $(LIBM) $(LIBDL), \ |
|
49241 | 479 |
LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \ |
41132 | 480 |
)) |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
481 |
|
41132 | 482 |
# AIX warning explanation: |
483 |
# 1506-356 : (W) Compilation unit is empty. |
|
484 |
# This happens during the headless build |
|
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
36110
diff
changeset
|
485 |
|
41132 | 486 |
$(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
487 |
|
41132 | 488 |
TARGETS += $(BUILD_LIBAWT_HEADLESS) |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
489 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
490 |
endif |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
491 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
492 |
################################################################################ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
493 |
|
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
494 |
ifeq ($(FREETYPE_TO_USE), system) |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
495 |
# For use by libfontmanager: |
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
496 |
LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
497 |
LIBFREETYPE_LIBS := $(FREETYPE_LIBS) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
498 |
else |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
499 |
BUILD_LIBFREETYPE_HEADER_DIRS := $(TOPDIR)/src/$(MODULE)/share/native/libfreetype/include |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
500 |
BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
501 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
502 |
# For use by libfontmanager: |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
503 |
LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS) |
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
504 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
505 |
LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
506 |
else |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
507 |
LIBFREETYPE_LIBS := -lfreetype |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
508 |
endif |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
509 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
510 |
$(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \ |
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
511 |
NAME := freetype, \ |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
512 |
OPTIMIZATION := HIGHEST, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
513 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
514 |
$(BUILD_LIBFREETYPE_CFLAGS), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
515 |
EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \ |
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
516 |
DISABLED_WARNINGS_solstudio := \ |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
517 |
E_STATEMENT_NOT_REACHED \ |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
518 |
E_END_OF_LOOP_CODE_NOT_REACHED, \ |
49566
7c224ec572d0
8201267: Disable warnings for VS2017 to enable building
erikj
parents:
49539
diff
changeset
|
519 |
DISABLED_WARNINGS_microsoft := 4267 4244 4312, \ |
50479 | 520 |
DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
521 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
522 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
523 |
)) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
524 |
|
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
525 |
TARGETS += $(BUILD_LIBFREETYPE) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
526 |
endif |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
527 |
|
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
528 |
########################################################################### |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
529 |
|
34414
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
530 |
#### Begin harfbuzz configuration |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
531 |
|
50826 | 532 |
HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND |
34414
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
533 |
|
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
534 |
ifneq ($(OPENJDK_TARGET_OS), windows) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
535 |
HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
536 |
-DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
537 |
endif |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
538 |
ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx)) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
539 |
HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
540 |
endif |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
541 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
542 |
HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
543 |
endif |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
544 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
545 |
HARFBUZZ_CFLAGS += -DHAVE_CORETEXT |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
546 |
endif |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
547 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
548 |
LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
549 |
endif |
34432 | 550 |
# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later. |
551 |
LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc |
|
34414
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
552 |
|
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
553 |
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
554 |
|
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
555 |
#### End harfbuzz configuration |
e496a8d8fc8a
8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents:
33647
diff
changeset
|
556 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
557 |
LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
558 |
libfontmanager/harfbuzz \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
559 |
libfontmanager/harfbuzz/hb-ucdn \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
560 |
common/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
561 |
common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
562 |
libawt/java2d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
563 |
libawt/java2d/pipe \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
564 |
libawt/java2d/loops \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
565 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
566 |
|
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
567 |
LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
568 |
BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS) |
20547 | 569 |
|
570 |
LIBFONTMANAGER_OPTIMIZATION := HIGH |
|
571 |
||
572 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
573 |
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
|
574 |
X11TextRenderer.c |
|
575 |
LIBFONTMANAGER_OPTIMIZATION := HIGHEST |
|
21130 | 576 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
577 |
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
|
578 |
X11TextRenderer.c \ |
|
579 |
fontpath.c \ |
|
580 |
lcdglyph.c |
|
20547 | 581 |
else |
582 |
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ |
|
583 |
lcdglyph.c |
|
584 |
endif |
|
585 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
586 |
LIBFONTMANAGER_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS |
20547 | 587 |
|
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
588 |
ifeq ($(TOOLCHAIN_TYPE), gcc) |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
589 |
# Turn off all warnings for sunFont.c. This is needed because the specific warning |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
590 |
# about discarding 'const' qualifier cannot be turned off individually. |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
591 |
BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w |
20547 | 592 |
endif |
593 |
||
49693
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
594 |
# LDFLAGS clarification: |
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
595 |
# Filter relevant linker flags disallowing unresolved symbols as we cannot |
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
596 |
# build-time decide to which library to link against (libawt_headless or |
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
597 |
# libawt_xawt). See JDK-8196516 for details. |
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
598 |
$(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
599 |
NAME := fontmanager, \ |
20547 | 600 |
EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \ |
601 |
AccelGlyphCache.c, \ |
|
29931
64e274ed6567
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29734
diff
changeset
|
602 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
25859 | 603 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
604 |
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
|
20547 | 605 |
OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
25859 | 606 |
CFLAGS_windows = -DCC_NOEX, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
607 |
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \ |
37529
868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents:
36110
diff
changeset
|
608 |
WARNINGS_AS_ERRORS_xlc := false, \ |
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
609 |
DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ |
50826 | 610 |
type-limits missing-field-initializers implicit-fallthrough strict-aliasing, \ |
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
611 |
DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
612 |
maybe-uninitialized, \ |
30434 | 613 |
DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ |
614 |
tautological-constant-out-of-range-compare int-to-pointer-cast, \ |
|
35711
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
615 |
DISABLED_WARNINGS_C_solstudio = \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
616 |
E_INTEGER_OVERFLOW_DETECTED \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
617 |
E_ARG_INCOMPATIBLE_WITH_ARG_L \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
618 |
E_ENUM_VAL_OVERFLOWS_INT_MAX, \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
619 |
DISABLED_WARNINGS_CXX_solstudio := \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
620 |
truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ |
d08f24178498
8148629: Disable remaining warnings in awt/fontmanager
erikj
parents:
35276
diff
changeset
|
621 |
hidevf w_novirtualdescr arrowrtn2, \ |
48274 | 622 |
DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
49693
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
623 |
LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ |
fa23ea24dade
8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
sgehwolf
parents:
49566
diff
changeset
|
624 |
$(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ |
20547 | 625 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
27944 | 626 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
49991
033f3118dc67
8201524: [AIX] Don't link libfontmanager against libawt_headless
simonis
parents:
49697
diff
changeset
|
627 |
LDFLAGS_aix := -Wl$(COMMA)-berok, \ |
33406 | 628 |
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
629 |
LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
|
49533 | 630 |
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ |
631 |
-framework CoreGraphics, \ |
|
33406 | 632 |
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
20547 | 633 |
$(WIN_AWT_LIB), \ |
35276 | 634 |
)) |
20547 | 635 |
|
48040
26f1193f1348
8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents:
48032
diff
changeset
|
636 |
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
26f1193f1348
8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents:
48032
diff
changeset
|
637 |
|
49533 | 638 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
639 |
$(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) |
49533 | 640 |
endif |
641 |
||
49234
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
642 |
ifeq ($(FREETYPE_TO_USE), bundled) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
643 |
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE) |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
644 |
endif |
3375a8039fde
8193017: Import freetype sources into OpenJDK source tree
prr
parents:
49106
diff
changeset
|
645 |
|
48040
26f1193f1348
8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents:
48032
diff
changeset
|
646 |
TARGETS += $(BUILD_LIBFONTMANAGER) |
20547 | 647 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
648 |
################################################################################ |
20547 | 649 |
|
650 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
651 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
652 |
LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
653 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
654 |
LIBJAWT_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
655 |
include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
656 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
657 |
libawt/awt/image/cvutils \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
658 |
libawt/java2d \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
659 |
libawt/java2d/windows \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
660 |
libawt/windows \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
661 |
java.base:include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
662 |
java.base:libjava \ |
25859 | 663 |
# |
664 |
||
20547 | 665 |
ifeq ($(OPENJDK_TARGET_CPU), x86) |
666 |
KERNEL32_LIB := kernel32.lib |
|
667 |
endif |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
668 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
669 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
670 |
NAME := jawt, \ |
20547 | 671 |
OPTIMIZATION := LOW, \ |
672 |
CFLAGS := $(CXXFLAGS_JDKLIB) \ |
|
25859 | 673 |
$(LIBJAWT_CFLAGS), \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
674 |
EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \ |
33406 | 675 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ |
676 |
LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \ |
|
35276 | 677 |
)) |
20547 | 678 |
|
679 |
$(BUILD_LIBJAWT): $(BUILD_LIBAWT) |
|
680 |
||
45781
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
681 |
$(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \ |
49263
78af880eec61
8199749: Debug symbols are not copied to exploded image on Mac
erikj
parents:
49261
diff
changeset
|
682 |
FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \ |
45781
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
683 |
DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ |
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
684 |
)) |
20547 | 685 |
|
45781
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
686 |
$(COPY_JAWT_LIB): $(BUILD_LIBJAWT) |
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
687 |
|
0491f891667c
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents:
43806
diff
changeset
|
688 |
TARGETS += $(COPY_JAWT_LIB) |
20547 | 689 |
|
690 |
else # OPENJDK_TARGET_OS not windows |
|
691 |
||
692 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
693 |
# libjawt on macosx do not use the unix code |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
694 |
LIBJAWT_EXCLUDE_SRC_PATTERNS := unix |
25859 | 695 |
endif |
696 |
||
697 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
20547 | 698 |
JAWT_LIBS := -lawt_lwawt |
21130 | 699 |
else |
700 |
JAWT_LIBS := |
|
701 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
|
702 |
JAWT_LIBS += -lawt |
|
703 |
endif |
|
41132 | 704 |
ifeq ($(ENABLE_HEADLESS_ONLY), false) |
21130 | 705 |
JAWT_LIBS += -lawt_xawt |
706 |
else |
|
707 |
JAWT_LIBS += -lawt_headless |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
708 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
709 |
JAWT_CFLAGS += -DHEADLESS |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
710 |
endif |
21130 | 711 |
endif |
20547 | 712 |
endif |
713 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
714 |
$(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
715 |
NAME := jawt, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
716 |
EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \ |
20547 | 717 |
INCLUDE_FILES := $(JAWT_FILES), \ |
718 |
OPTIMIZATION := LOW, \ |
|
25859 | 719 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
720 |
$(JAWT_CFLAGS), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
721 |
EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
722 |
include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
723 |
common/awt, \ |
20547 | 724 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
725 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
27944 | 726 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
34695
7a6cc9982d22
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34432
diff
changeset
|
727 |
LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \ |
33406 | 728 |
LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ |
729 |
LIBS_solaris := $(X_LIBS) -lXrender, \ |
|
730 |
LIBS_macosx := -framework Cocoa, \ |
|
35276 | 731 |
)) |
20547 | 732 |
|
41132 | 733 |
ifeq ($(ENABLE_HEADLESS_ONLY), false) |
20547 | 734 |
$(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT) |
735 |
else |
|
736 |
$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) |
|
737 |
endif |
|
738 |
||
739 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
740 |
$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) |
|
741 |
endif |
|
742 |
||
743 |
endif # OPENJDK_TARGET_OS |
|
744 |
||
27565 | 745 |
TARGETS += $(BUILD_LIBJAWT) |
20547 | 746 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
747 |
################################################################################ |
12892 | 748 |
|
41132 | 749 |
ifeq ($(ENABLE_HEADLESS_ONLY), false) |
25859 | 750 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
751 |
LIBSPLASHSCREEN_EXTRA_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
752 |
common/awt/systemscale \ |
25859 | 753 |
# |
20547 | 754 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
755 |
ifeq ($(USE_EXTERNAL_LIBGIF), false) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
756 |
LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
757 |
else |
25859 | 758 |
LIBSPLASHSCREEN_EXCLUDES := giflib |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
759 |
GIFLIB_LIBS := -lgif |
20547 | 760 |
endif |
761 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
762 |
ifeq ($(USE_EXTERNAL_LIBJPEG), false) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
763 |
# While the following ought to work, it will currently pull in the closed |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
764 |
# additions to this library, and this was not done previously in the build. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
765 |
# LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
766 |
LIBSPLASHSCREEN_EXTRA_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg |
25103 | 767 |
else |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
768 |
LIBJPEG_LIBS := -ljpeg |
25103 | 769 |
endif |
770 |
||
23305 | 771 |
ifeq ($(USE_EXTERNAL_LIBPNG), false) |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
772 |
LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
773 |
|
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
774 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
775 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
776 |
# When building our own libpng and using an external libz, we need to |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
777 |
# inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
778 |
# $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
779 |
# for details. This must be specified with -iquote, not -I to avoid a |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
780 |
# circular include. |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
781 |
LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/$(MODULE)/macosx/native/libsplashscreen/libpng/zlibwrapper |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
782 |
endif |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
783 |
endif |
25859 | 784 |
else |
785 |
LIBSPLASHSCREEN_EXCLUDES += libpng |
|
23305 | 786 |
endif |
787 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
788 |
ifeq ($(USE_EXTERNAL_LIBZ), false) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
789 |
LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib |
20547 | 790 |
endif |
791 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
792 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
793 |
# libsplashscreen on macosx do not use the unix code |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
794 |
LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix |
36869 | 795 |
endif |
36880
3a05117c7611
8151770: 9-client windows builds fail on windows since make file change for 8145174
erikj
parents:
36869
diff
changeset
|
796 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
797 |
LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
20547 | 798 |
|
799 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
800 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
|
801 |
||
25859 | 802 |
BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
803 |
BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
|
804 |
BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
|
805 |
BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
|
806 |
BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0 |
|
807 |
BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 |
|
808 |
BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 |
|
20547 | 809 |
|
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
810 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
811 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 |
20547 | 812 |
else |
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
813 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) |
20547 | 814 |
endif |
815 |
||
33406 | 816 |
LIBSPLASHSCREEN_LIBS := |
20547 | 817 |
|
818 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
33406 | 819 |
LIBSPLASHSCREEN_LIBS += \ |
27565 | 820 |
$(LIBM) -lpthread -liconv -losxapp \ |
20547 | 821 |
-framework ApplicationServices \ |
822 |
-framework Foundation \ |
|
823 |
-framework Cocoa \ |
|
824 |
-framework JavaNativeFoundation |
|
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
825 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
36907 | 826 |
LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
23592
35b16ae6b4f4
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23310
diff
changeset
|
827 |
else |
39844
a3cc7e551a48
8149115: [hidpi] Linux: display-wise scaling factor should probably be taken into account
ssadetsky
parents:
39550
diff
changeset
|
828 |
LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
829 |
endif |
20547 | 830 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
831 |
LIBSPLASHSCREEN_HEADER_DIRS += \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
832 |
libosxapp \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
833 |
java.base:include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
834 |
java.base:libjava \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
835 |
# |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
836 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
837 |
$(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
838 |
NAME := splashscreen, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
839 |
EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
840 |
EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \ |
20547 | 841 |
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
25859 | 842 |
EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \ |
20547 | 843 |
OPTIMIZATION := LOW, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
844 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \ |
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
48731
diff
changeset
|
845 |
$(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
846 |
EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \ |
48766
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
847 |
DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
2c4d1993b5f9
8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents:
48751
diff
changeset
|
848 |
maybe-uninitialized shift-negative-value implicit-fallthrough, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
849 |
DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
32408
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
31159
diff
changeset
|
850 |
DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ |
97230ec16697
8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents:
31159
diff
changeset
|
851 |
E_STATEMENT_NOT_REACHED, \ |
30502
50552a5900a2
8080317: Disable warning treated as error for signed/unsigned comparison in building splashscreen
prr
parents:
30439
diff
changeset
|
852 |
DISABLED_WARNINGS_microsoft := 4018 4244 4267, \ |
49239 | 853 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
20547 | 854 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
49239 | 855 |
LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \ |
856 |
LDFLAGS_windows := -delayload:user32.dll, \ |
|
48751
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
48731
diff
changeset
|
857 |
LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \ |
54f355e65415
8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents:
48731
diff
changeset
|
858 |
$(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \ |
33518
3f1644328d06
8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents:
33406
diff
changeset
|
859 |
LIBS_aix := -liconv, \ |
35276 | 860 |
)) |
20547 | 861 |
|
27565 | 862 |
TARGETS += $(BUILD_LIBSPLASHSCREEN) |
20547 | 863 |
|
864 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
865 |
$(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp) |
20547 | 866 |
endif |
867 |
||
868 |
endif |
|
869 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
870 |
################################################################################ |
20547 | 871 |
|
872 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
873 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
874 |
LIBAWT_LWAWT_EXTRA_SRC := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
875 |
$(TOPDIR)/src/$(MODULE)/unix/native/common/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
876 |
$(TOPDIR)/src/$(MODULE)/share/native/common/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
877 |
$(TOPDIR)/src/$(MODULE)/share/native/common/java2d \ |
25859 | 878 |
# |
20547 | 879 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
880 |
LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
881 |
$(LIBAWT_DEFAULT_HEADER_DIRS) \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
882 |
libawt_lwawt/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
883 |
libawt_lwawt/font \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
884 |
libawt_lwawt/java2d/opengl \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
885 |
include \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
886 |
common/awt/debug \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
887 |
common/java2d/opengl \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
888 |
libosxapp \ |
25859 | 889 |
# |
20547 | 890 |
|
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
891 |
LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS) |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
892 |
|
26741 | 893 |
LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
894 |
LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib |
20547 | 895 |
|
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
896 |
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
897 |
NAME := awt_lwawt, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
898 |
EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \ |
20547 | 899 |
INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \ |
25859 | 900 |
EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \ |
901 |
EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
|
20547 | 902 |
OPTIMIZATION := LOW, \ |
903 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
25859 | 904 |
$(LIBAWT_LWAWT_CFLAGS), \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
905 |
EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \ |
32872 | 906 |
DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
907 |
deprecated-declarations objc-method-access bitwise-op-parentheses \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
908 |
incompatible-pointer-types parentheses-equality extra-tokens, \ |
20547 | 909 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
27565 | 910 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
27944 | 911 |
-L$(INSTALL_LIBRARIES_HERE), \ |
33406 | 912 |
LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ |
20547 | 913 |
-framework Accelerate \ |
914 |
-framework ApplicationServices \ |
|
915 |
-framework AudioToolbox \ |
|
916 |
-framework Carbon \ |
|
917 |
-framework Cocoa \ |
|
918 |
-framework Security \ |
|
919 |
-framework ExceptionHandling \ |
|
920 |
-framework JavaNativeFoundation \ |
|
921 |
-framework JavaRuntimeSupport \ |
|
922 |
-framework OpenGL \ |
|
923 |
-framework QuartzCore -ljava, \ |
|
35276 | 924 |
)) |
20547 | 925 |
|
27565 | 926 |
TARGETS += $(BUILD_LIBAWT_LWAWT) |
20547 | 927 |
|
928 |
$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT) |
|
929 |
||
930 |
$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE) |
|
931 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
932 |
$(BUILD_LIBAWT_LWAWT): $(call FindLib, $(MODULE), osxapp) |
20547 | 933 |
|
27565 | 934 |
$(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java) |
20547 | 935 |
|
936 |
endif |
|
937 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
938 |
################################################################################ |
20547 | 939 |
|
940 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
941 |
||
49244
995a5556edfa
8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents:
49241
diff
changeset
|
942 |
$(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
49070
d7859531621b
8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents:
48766
diff
changeset
|
943 |
NAME := osxui, \ |
20547 | 944 |
OPTIMIZATION := LOW, \ |
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
945 |
CFLAGS := $(CFLAGS_JDKLIB), \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
946 |
EXTRA_HEADER_DIRS := \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
947 |
libawt_lwawt/awt \ |
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
948 |
libosxapp, \ |
49523 | 949 |
DISABLED_WARNINGS_clang := deprecated-declarations, \ |
20547 | 950 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
951 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
|
34695
7a6cc9982d22
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34432
diff
changeset
|
952 |
-Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
27944 | 953 |
-L$(INSTALL_LIBRARIES_HERE), \ |
33406 | 954 |
LIBS := -lawt -losxapp -lawt_lwawt \ |
20547 | 955 |
-framework Cocoa \ |
956 |
-framework Carbon \ |
|
957 |
-framework ApplicationServices \ |
|
958 |
-framework JavaNativeFoundation \ |
|
959 |
-framework JavaRuntimeSupport \ |
|
960 |
-ljava -ljvm, \ |
|
35276 | 961 |
)) |
20547 | 962 |
|
27565 | 963 |
TARGETS += $(BUILD_LIBOSXUI) |
20547 | 964 |
|
965 |
$(BUILD_LIBOSXUI): $(BUILD_LIBAWT) |
|
966 |
||
50471
f0aeede1b855
8204572: SetupJdkLibrary should setup SRC and -I flags automatically
ihse
parents:
50357
diff
changeset
|
967 |
$(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp) |
20547 | 968 |
|
969 |
$(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT) |
|
970 |
||
971 |
endif |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
972 |
|
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
973 |
################################################################################ |
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
974 |
|
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
975 |
# Hook to include the corresponding custom file, if present. |
47314 | 976 |
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk)) |