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