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