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