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