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