author | prr |
Wed, 13 May 2015 14:16:46 -0700 | |
changeset 30502 | 50552a5900a2 |
parent 30439 | 8f2f69320a3a |
child 31157 | 25a62bb54efa |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, 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), \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
57 |
DISABLED_WARNINGS_gcc := parentheses, \ |
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), \ |
|
63 |
LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \ |
|
64 |
$(LDFLAGS_JDKLIB_SUFFIX), \ |
|
65 |
LDFLAGS_SUFFIX_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, \ |
20547 | 72 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
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 |
$(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ |
|
135 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
136 |
LDFLAGS_SUFFIX_solaris := -lc, \ |
|
27565 | 137 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \ |
20547 | 138 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
139 |
||
27565 | 140 |
$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java) |
20547 | 141 |
|
27565 | 142 |
TARGETS += $(BUILD_LIBMLIB_IMAGE_V) |
12892 | 143 |
|
144 |
endif |
|
145 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
146 |
################################################################################ |
12892 | 147 |
|
25859 | 148 |
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
|
149 |
$(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
|
150 |
$(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
|
151 |
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
25859 | 152 |
# |
20547 | 153 |
|
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
154 |
ifeq ($(OPENJDK_TARGET_OS), aix) |
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
155 |
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
|
156 |
endif |
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
157 |
|
20547 | 158 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
159 |
LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility |
25859 | 160 |
else |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
161 |
LIBAWT_EXFILES := java2d/ShaderList.c |
25859 | 162 |
endif |
163 |
||
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
164 |
ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
25859 | 165 |
LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
14231 | 166 |
endif |
13164 | 167 |
|
25859 | 168 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
169 |
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
|
170 |
endif |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
22595
diff
changeset
|
171 |
|
27565 | 172 |
LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
25859 | 173 |
$(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \ |
174 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
175 |
$(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \ |
|
176 |
# |
|
177 |
||
26225
3c7e92c78bab
8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents:
26191
diff
changeset
|
178 |
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS) |
20547 | 179 |
|
13164 | 180 |
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |
20547 | 181 |
LIBAWT_CFLAGS += -DMLIB_ADD_SUFF |
182 |
LIBAWT_CFLAGS += -xarch=sparcvis |
|
183 |
||
25859 | 184 |
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
|
185 |
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
|
186 |
LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c |
20547 | 187 |
|
188 |
ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
|
189 |
LIBAWT_ASFLAGS = -P -xarch=v9a |
|
190 |
else |
|
191 |
LIBAWT_ASFLAGS = -P -xarch=v8plusa |
|
192 |
endif |
|
12892 | 193 |
else |
25859 | 194 |
LIBAWT_EXCLUDES += \ |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
195 |
$(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
|
196 |
$(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
|
197 |
$(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \ |
25859 | 198 |
# |
12892 | 199 |
endif |
200 |
||
20547 | 201 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
202 |
LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH |
|
12892 | 203 |
endif |
204 |
||
20547 | 205 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
206 |
LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
207 |
$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
25859 | 208 |
# Why does libawt need java.base headers? |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
209 |
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
|
210 |
-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
|
211 |
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
25859 | 212 |
-I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
213 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
|
27565 | 214 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
25859 | 215 |
# |
216 |
LIBAWT_EXFILES += \ |
|
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
217 |
java2d/d3d/D3DShaderGen.c \ |
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
218 |
awt/image/cvutils/img_colors.c \ |
25859 | 219 |
# |
20547 | 220 |
|
221 |
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE |
|
222 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
|
223 |
LIBAWT_CFLAGS += -DMLIB_OS64BIT |
|
224 |
endif |
|
225 |
||
226 |
ifdef OPENJDK |
|
25859 | 227 |
LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons" |
20547 | 228 |
else |
25859 | 229 |
LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons" |
20547 | 230 |
endif |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
231 |
LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc |
12892 | 232 |
endif |
233 |
||
21805 | 234 |
LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers |
20547 | 235 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
236 |
LIBAWT_MAPFILE := |
|
12892 | 237 |
endif |
238 |
||
20547 | 239 |
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \ |
240 |
LIBRARY := awt, \ |
|
241 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
242 |
SRC := $(LIBAWT_DIRS), \ |
|
25859 | 243 |
EXCLUDES := $(LIBAWT_EXCLUDES), \ |
244 |
EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
|
20547 | 245 |
OPTIMIZATION := LOW, \ |
246 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
247 |
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
|
248 |
format-nonliteral parentheses, \ |
30434 | 249 |
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
|
250 |
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
30434 | 251 |
DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \ |
252 |
WARNINGS_AS_ERRORS_gcc := false, \ |
|
20547 | 253 |
ASFLAGS := $(LIBAWT_ASFLAGS), \ |
254 |
MAPFILE := $(LIBAWT_MAPFILE), \ |
|
255 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
256 |
LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \ |
|
257 |
LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \ |
|
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
258 |
LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\ |
27565 | 259 |
LDFLAGS_SUFFIX_macosx := -L$(INSTALL_LIBRARIES_HERE) \ |
260 |
-lmlib_image -ljvm $(LIBM) \ |
|
20547 | 261 |
-framework Cocoa \ |
262 |
-framework OpenGL \ |
|
263 |
-framework JavaNativeFoundation \ |
|
264 |
-framework JavaRuntimeSupport \ |
|
265 |
-framework ApplicationServices \ |
|
266 |
-framework AudioToolbox \ |
|
267 |
-ljava, \ |
|
268 |
LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ |
|
269 |
imm32.lib ole32.lib uuid.lib shell32.lib \ |
|
270 |
comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \ |
|
271 |
delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
|
272 |
-DELAYLOAD:user32.dll -DELAYLOAD:gdi32.dll \ |
|
273 |
-DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \ |
|
274 |
-DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \ |
|
275 |
-DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \ |
|
276 |
-DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \ |
|
277 |
VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \ |
|
278 |
RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \ |
|
279 |
-D "JDK_FNAME=awt.dll" \ |
|
280 |
-D "JDK_INTERNAL_NAME=awt" \ |
|
281 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 282 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt, \ |
20547 | 283 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
284 |
||
27565 | 285 |
$(BUILD_LIBAWT): $(call FindLib, java.base, java) |
13164 | 286 |
|
287 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
20547 | 288 |
$(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE) |
13164 | 289 |
endif |
290 |
||
27565 | 291 |
TARGETS += $(BUILD_LIBAWT) |
12892 | 292 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
293 |
################################################################################ |
12892 | 294 |
|
21130 | 295 |
ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) |
20547 | 296 |
ifndef BUILD_HEADLESS_ONLY |
297 |
||
298 |
LIBAWT_XAWT_DIRS := \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
26751
diff
changeset
|
299 |
$(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
|
300 |
$(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
|
301 |
$(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
|
302 |
$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
303 |
$(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
|
304 |
$(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
|
305 |
$(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
|
306 |
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
25859 | 307 |
# |
308 |
||
309 |
LIBAWT_XAWT_EXCLUDES := medialib |
|
20547 | 310 |
|
25859 | 311 |
LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ |
27565 | 312 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
25859 | 313 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
314 |
-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
|
315 |
-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
|
316 |
-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
|
317 |
-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
|
318 |
-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
|
319 |
-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
|
320 |
-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
|
321 |
-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
|
322 |
-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
|
323 |
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \ |
25859 | 324 |
$(LIBJAVA_HEADER_FLAGS) |
325 |
# |
|
326 |
||
327 |
LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
|
21130 | 328 |
-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
25859 | 329 |
$(CUPS_CFLAGS) |
20547 | 330 |
|
331 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
|
332 |
LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
|
333 |
endif |
|
334 |
||
335 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
|
336 |
ifeq ($(DISABLE_XRENDER), true) |
|
337 |
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true |
|
338 |
endif |
|
339 |
endif |
|
340 |
||
341 |
LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc |
|
342 |
||
343 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
|
344 |
# To match old build, add this to LDFLAGS instead of suffix. |
|
345 |
LIBAWT_XAWT_LDFLAGS += -lpthread |
|
346 |
endif |
|
347 |
||
348 |
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ |
|
349 |
LIBRARY := awt_xawt, \ |
|
350 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
351 |
SRC := $(LIBAWT_XAWT_DIRS), \ |
|
25859 | 352 |
EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \ |
20547 | 353 |
OPTIMIZATION := LOW, \ |
354 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
|
355 |
$(X_CFLAGS), \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
356 |
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
|
357 |
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
|
358 |
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
|
359 |
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
|
360 |
E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ |
30434 | 361 |
WARNINGS_AS_ERRORS_gcc := false, \ |
21805 | 362 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ |
20547 | 363 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
23592
35b16ae6b4f4
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23310
diff
changeset
|
364 |
$(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \ |
20547 | 365 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
27565 | 366 |
$(call SET_SHARED_LIBRARY_ORIGIN,/..) \ |
27944 | 367 |
-L$(INSTALL_LIBRARIES_HERE), \ |
20547 | 368 |
LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \ |
25859 | 369 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 370 |
RC_FLAGS := $(RC_FLAGS) \ |
371 |
-D "JDK_FNAME=xawt.dll" \ |
|
372 |
-D "JDK_INTERNAL_NAME=xawt" \ |
|
373 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 374 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_xawt, \ |
20547 | 375 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
376 |
||
27565 | 377 |
$(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java) |
20547 | 378 |
|
379 |
$(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT) |
|
380 |
||
27565 | 381 |
TARGETS += $(BUILD_LIBAWT_XAWT) |
20547 | 382 |
|
383 |
endif |
|
384 |
endif |
|
385 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
386 |
################################################################################ |
20547 | 387 |
|
25859 | 388 |
LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms |
27565 | 389 |
LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
26751
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
390 |
-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
|
391 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
25859 | 392 |
$(LIBJAVA_HEADER_FLAGS) \ |
393 |
# |
|
24540 | 394 |
|
395 |
ifeq ($(USE_EXTERNAL_LCMS), true) |
|
396 |
# If we're using an external library, we'll just need the wrapper part. |
|
397 |
# By including it explicitely, all other files will be excluded. |
|
398 |
BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c |
|
399 |
else |
|
400 |
BUILD_LIBLCMS_INCLUDE_FILES := |
|
401 |
# If we're using the bundled library, we'll need to include it in the |
|
402 |
# include path explicitly. Otherwise the system headers will be used. |
|
25859 | 403 |
LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC)) |
24540 | 404 |
endif |
405 |
||
20547 | 406 |
$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ |
407 |
LIBRARY := lcms, \ |
|
408 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 409 |
SRC := $(LIBLCMS_SRC), \ |
24540 | 410 |
INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
20547 | 411 |
OPTIMIZATION := HIGHEST, \ |
412 |
CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \ |
|
30434 | 413 |
$(LIBLCMS_CPPFLAGS) \ |
24540 | 414 |
$(LCMS_CFLAGS), \ |
20547 | 415 |
CFLAGS_solaris := -xc99=no_lib, \ |
416 |
CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
|
30434 | 417 |
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
|
418 |
DISABLED_WARNINGS_clang := tautological-compare, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
419 |
DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
21805 | 420 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ |
20547 | 421 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
422 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
27944 | 423 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
20547 | 424 |
LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
425 |
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
|
24540 | 426 |
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \ |
427 |
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ |
|
428 |
LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ |
|
429 |
LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\ |
|
25859 | 430 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 431 |
RC_FLAGS := $(RC_FLAGS) \ |
432 |
-D "JDK_FNAME=lcms.dll" \ |
|
433 |
-D "JDK_INTERNAL_NAME=lcms" \ |
|
434 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 435 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/liblcms, \ |
20547 | 436 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
437 |
||
27565 | 438 |
TARGETS += $(BUILD_LIBLCMS) |
20547 | 439 |
|
440 |
$(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
|
441 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
442 |
################################################################################ |
20547 | 443 |
|
444 |
ifdef OPENJDK |
|
25103 | 445 |
BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers |
20547 | 446 |
else |
25103 | 447 |
BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed |
25859 | 448 |
LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg |
20547 | 449 |
endif |
450 |
||
25859 | 451 |
LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg |
452 |
||
25103 | 453 |
BUILD_LIBJAVAJPEG_REORDER := |
13164 | 454 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
20547 | 455 |
ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
25103 | 456 |
BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) |
20547 | 457 |
endif |
458 |
endif |
|
459 |
||
25103 | 460 |
|
20547 | 461 |
# Suppress gcc warnings like "variable might be clobbered by 'longjmp' |
462 |
# or 'vfork'": this warning indicates that some variable is placed to |
|
463 |
# a register by optimized compiler and it's value might be lost on longjmp(). |
|
464 |
# Recommended way to avoid such warning is to declare the variable as |
|
465 |
# volatile to prevent the optimization. However, this approach does not |
|
466 |
# work because we have to declare all variables as volatile in result. |
|
467 |
#ifndef CROSS_COMPILE_ARCH |
|
468 |
# CC_43_OR_NEWER := \ |
|
469 |
# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ |
|
470 |
# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) |
|
471 |
# ifeq ($(CC_43_OR_NEWER), 1) |
|
25103 | 472 |
# BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered |
20547 | 473 |
# endif |
474 |
#endif |
|
475 |
||
25103 | 476 |
ifeq ($(USE_EXTERNAL_LIBJPEG), true) |
477 |
LIBJPEG_LIBS := -ljpeg |
|
478 |
BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ |
|
479 |
imageIOJPEG.c \ |
|
480 |
jpegdecoder.c |
|
481 |
BUILD_LIBJAVAJPEG_HEADERS := |
|
482 |
else |
|
483 |
LIBJPEG_LIBS := |
|
484 |
BUILD_LIBJAVAJPEG_INCLUDE_FILES := |
|
25859 | 485 |
BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC)) |
25103 | 486 |
endif |
487 |
||
488 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ |
|
489 |
LIBRARY := javajpeg, \ |
|
20547 | 490 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
25859 | 491 |
SRC := $(LIBJAVAJPEG_SRC), \ |
25103 | 492 |
INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
20547 | 493 |
OPTIMIZATION := HIGHEST, \ |
25859 | 494 |
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \ |
495 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
27565 | 496 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
497 |
DISABLED_WARNINGS_gcc := clobbered parentheses, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
498 |
DISABLED_WARNINGS_clang := logical-op-parentheses, \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
499 |
DISABLED_WARNINGS_microsoft := 4267, \ |
25103 | 500 |
MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ |
501 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ |
|
20547 | 502 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
503 |
LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
|
504 |
LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ |
|
25859 | 505 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 506 |
RC_FLAGS := $(RC_FLAGS) \ |
25103 | 507 |
-D "JDK_FNAME=javajpeg.dll" \ |
508 |
-D "JDK_INTERNAL_NAME=javajpeg" \ |
|
20547 | 509 |
-D "JDK_FTYPE=0x2L", \ |
25103 | 510 |
REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \ |
27565 | 511 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \ |
20547 | 512 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
513 |
||
27565 | 514 |
$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java) |
20547 | 515 |
|
27565 | 516 |
TARGETS += $(BUILD_LIBJAVAJPEG) |
20547 | 517 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
518 |
################################################################################ |
20547 | 519 |
|
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
520 |
ifeq ($(BUILD_HEADLESS), true) |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
521 |
# 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
|
522 |
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
|
523 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
524 |
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
|
525 |
$(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
|
526 |
$(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
|
527 |
$(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
|
528 |
$(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
|
529 |
$(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
|
530 |
# |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
531 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
532 |
LIBAWT_HEADLESS_EXCLUDES := medialib |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
533 |
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
|
534 |
$(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
535 |
-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
|
536 |
-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
|
537 |
-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
|
538 |
-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
|
539 |
-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
|
540 |
-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
|
541 |
-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
|
542 |
-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
|
543 |
-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
|
544 |
-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
|
545 |
$(LIBJAVA_HEADER_FLAGS) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
546 |
# |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
547 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
548 |
LIBAWT_HEADLESS_REORDER := |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
549 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
550 |
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
|
551 |
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
|
552 |
endif |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
553 |
endif |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
554 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
555 |
$(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
|
556 |
LIBRARY := awt_headless, \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
557 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
558 |
SRC := $(LIBAWT_HEADLESS_DIRS), \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
559 |
EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
560 |
OPTIMIZATION := LOW, \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
561 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
562 |
-DHEADLESS=true \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
563 |
-DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
564 |
$(CUPS_CFLAGS) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
565 |
$(X_CFLAGS) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
566 |
$(LIBAWT_HEADLESS_CFLAGS), \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
567 |
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
|
568 |
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
|
569 |
E_EMPTY_TRANSLATION_UNIT, \ |
29006
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
570 |
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
|
571 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
572 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
573 |
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
|
574 |
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
|
575 |
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
|
576 |
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
577 |
REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
578 |
LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
579 |
LDFLAGS_SUFFIX_aix := -ljvm -lawt -ljava,\ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
580 |
LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
581 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
582 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
583 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
584 |
$(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
585 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
586 |
TARGETS += $(BUILD_LIBAWT_HEADLESS) |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
587 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
588 |
endif |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
589 |
endif |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
590 |
|
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
591 |
################################################################################ |
0d72c5ab72d8
8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents:
29002
diff
changeset
|
592 |
|
25859 | 593 |
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
|
594 |
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager |
25859 | 595 |
LIBFONTMANAGER_CFLAGS := \ |
596 |
$(addprefix -I, $(shell $(FIND) \ |
|
597 |
$(LIBFONTMANAGER_SRC) \ |
|
598 |
$(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
|
599 |
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
25859 | 600 |
$(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
|
601 |
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \ |
27565 | 602 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
25859 | 603 |
$(LIBJAVA_HEADER_FLAGS) \ |
604 |
# |
|
605 |
||
20547 | 606 |
ifndef OPENJDK |
25859 | 607 |
LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k |
21805 | 608 |
BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers |
20547 | 609 |
LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c |
610 |
else |
|
25859 | 611 |
LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) |
21805 | 612 |
BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk |
20899 | 613 |
BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS) |
20547 | 614 |
endif |
615 |
||
616 |
LIBFONTMANAGER_OPTIMIZATION := HIGH |
|
617 |
||
618 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
619 |
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
|
620 |
X11TextRenderer.c |
|
621 |
LIBFONTMANAGER_OPTIMIZATION := HIGHEST |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
26751
diff
changeset
|
622 |
LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows |
21130 | 623 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
624 |
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
|
625 |
X11TextRenderer.c \ |
|
626 |
fontpath.c \ |
|
627 |
lcdglyph.c |
|
20547 | 628 |
else |
629 |
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ |
|
630 |
lcdglyph.c |
|
631 |
endif |
|
632 |
||
25859 | 633 |
LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS |
20547 | 634 |
|
635 |
# Turn off aliasing with GCC for ExtensionSubtables.cpp |
|
636 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
|
637 |
BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
|
638 |
endif |
|
639 |
||
640 |
$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ |
|
641 |
LIBRARY := fontmanager, \ |
|
642 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 643 |
SRC := $(LIBFONTMANAGER_SRC), \ |
20547 | 644 |
EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \ |
645 |
AccelGlyphCache.c, \ |
|
29931
64e274ed6567
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29734
diff
changeset
|
646 |
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
25859 | 647 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
648 |
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
|
20547 | 649 |
OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
25859 | 650 |
CFLAGS_windows = -DCC_NOEX, \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
651 |
DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast reorder \ |
30434 | 652 |
delete-non-virtual-dtor type-limits, \ |
653 |
DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ |
|
654 |
tautological-constant-out-of-range-compare int-to-pointer-cast, \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
655 |
DISABLED_WARNINGS_solstudio := truncwarn, \ |
30439
8f2f69320a3a
8080013: OpenJDK windows build fails due to warning in libfontmanager
ihse
parents:
30434
diff
changeset
|
656 |
DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146, \ |
30434 | 657 |
WARNINGS_AS_ERRORS_gcc := false, \ |
658 |
WARNINGS_AS_ERRORS_solstudio := false, \ |
|
20547 | 659 |
MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
660 |
LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
|
661 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
27944 | 662 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
20547 | 663 |
LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
664 |
LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
|
29002
613ae4804312
8071710: [solaris] libfontmanager should be linked against headless awt library
prr
parents:
28537
diff
changeset
|
665 |
LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
613ae4804312
8071710: [solaris] libfontmanager should be linked against headless awt library
prr
parents:
28537
diff
changeset
|
666 |
LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
20547 | 667 |
LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
668 |
-ljava -ljvm, \ |
|
669 |
LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
|
670 |
$(WIN_AWT_LIB), \ |
|
25859 | 671 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 672 |
RC_FLAGS := $(RC_FLAGS) \ |
673 |
-D "JDK_FNAME=fontmanager.dll" \ |
|
674 |
-D "JDK_INTERNAL_NAME=fontmanager" \ |
|
675 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 676 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \ |
20547 | 677 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
678 |
||
679 |
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
|
680 |
||
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
681 |
ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) |
29002
613ae4804312
8071710: [solaris] libfontmanager should be linked against headless awt library
prr
parents:
28537
diff
changeset
|
682 |
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS) |
20547 | 683 |
endif |
684 |
||
27565 | 685 |
TARGETS += $(BUILD_LIBFONTMANAGER) |
20547 | 686 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
687 |
################################################################################ |
20547 | 688 |
|
689 |
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
|
690 |
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
|
691 |
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
|
692 |
-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
|
693 |
-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
|
694 |
-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
|
695 |
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \ |
27565 | 696 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
25859 | 697 |
-I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
698 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
|
699 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
700 |
# |
|
701 |
||
20547 | 702 |
ifeq ($(OPENJDK_TARGET_CPU), x86) |
703 |
KERNEL32_LIB := kernel32.lib |
|
704 |
endif |
|
705 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \ |
|
706 |
LIBRARY := jawt, \ |
|
707 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 708 |
SRC := $(LIBJAWT_SRC), \ |
709 |
INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \ |
|
20547 | 710 |
OPTIMIZATION := LOW, \ |
711 |
CFLAGS := $(CXXFLAGS_JDKLIB) \ |
|
712 |
-EHsc -DUNICODE -D_UNICODE \ |
|
25859 | 713 |
$(LIBJAWT_CFLAGS), \ |
20547 | 714 |
LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ |
715 |
advapi32.lib $(WIN_AWT_LIB), \ |
|
716 |
LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ |
|
25859 | 717 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 718 |
RC_FLAGS := $(RC_FLAGS) \ |
719 |
-D "JDK_FNAME=jawt.dll" \ |
|
720 |
-D "JDK_INTERNAL_NAME=jawt" \ |
|
721 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 722 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \ |
20547 | 723 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
724 |
||
725 |
$(BUILD_LIBJAWT): $(BUILD_LIBAWT) |
|
726 |
||
727 |
$(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT) |
|
728 |
$(ECHO) Copying $(@F) |
|
27565 | 729 |
$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ |
20547 | 730 |
|
27565 | 731 |
TARGETS += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) |
20547 | 732 |
|
733 |
else # OPENJDK_TARGET_OS not windows |
|
734 |
||
735 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
25859 | 736 |
LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt |
737 |
else |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
26751
diff
changeset
|
738 |
LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt |
25859 | 739 |
endif |
740 |
LIBJAWT_CFLAGS := \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
26751
diff
changeset
|
741 |
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
25859 | 742 |
-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
|
743 |
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ |
25859 | 744 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
745 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
746 |
# |
|
747 |
||
748 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
20547 | 749 |
JAWT_LIBS := -lawt_lwawt |
21130 | 750 |
else |
751 |
JAWT_LIBS := |
|
752 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
|
753 |
JAWT_LIBS += -lawt |
|
754 |
endif |
|
755 |
ifndef BUILD_HEADLESS_ONLY |
|
756 |
JAWT_LIBS += -lawt_xawt |
|
757 |
else |
|
758 |
JAWT_LIBS += -lawt_headless |
|
759 |
HEADLESS_CFLAG += -DHEADLESS |
|
760 |
endif |
|
20547 | 761 |
endif |
762 |
||
763 |
$(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \ |
|
764 |
LIBRARY := jawt, \ |
|
765 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 766 |
SRC := $(LIBJAWT_SRC), \ |
20547 | 767 |
INCLUDE_FILES := $(JAWT_FILES), \ |
768 |
OPTIMIZATION := LOW, \ |
|
25859 | 769 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
770 |
$(LIBJAWT_CFLAGS), \ |
|
20547 | 771 |
CFLAGS_linux := $(HEADLESS_CFLAG), \ |
25859 | 772 |
CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \ |
21805 | 773 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
20547 | 774 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
775 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
27944 | 776 |
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
23592
35b16ae6b4f4
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23310
diff
changeset
|
777 |
LDFLAGS_solaris := $(X_LIBS), \ |
20547 | 778 |
LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
779 |
LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
20547 | 780 |
LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
781 |
LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
|
782 |
-framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \ |
|
27565 | 783 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \ |
20547 | 784 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
785 |
||
786 |
ifndef BUILD_HEADLESS_ONLY |
|
787 |
$(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT) |
|
788 |
else |
|
789 |
$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) |
|
790 |
endif |
|
791 |
||
792 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
793 |
$(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) |
|
794 |
endif |
|
795 |
||
796 |
endif # OPENJDK_TARGET_OS |
|
797 |
||
27565 | 798 |
TARGETS += $(BUILD_LIBJAWT) |
20547 | 799 |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
800 |
################################################################################ |
12892 | 801 |
|
20547 | 802 |
ifndef BUILD_HEADLESS_ONLY |
25859 | 803 |
|
20547 | 804 |
LIBSPLASHSCREEN_DIRS := \ |
25859 | 805 |
$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg \ |
806 |
$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen \ |
|
807 |
# |
|
20547 | 808 |
|
809 |
ifeq ($(USE_EXTERNAL_LIBGIF), true) |
|
810 |
GIFLIB_LDFLAGS := -lgif |
|
25859 | 811 |
LIBSPLASHSCREEN_EXCLUDES := giflib |
20547 | 812 |
else |
25859 | 813 |
LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib |
20547 | 814 |
endif |
815 |
||
25103 | 816 |
ifeq ($(USE_EXTERNAL_LIBJPEG), true) |
817 |
LIBJPEG_LDFLAGS := -ljpeg |
|
818 |
else |
|
25859 | 819 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg |
820 |
LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg |
|
25103 | 821 |
endif |
822 |
||
23305 | 823 |
ifeq ($(USE_EXTERNAL_LIBPNG), false) |
25859 | 824 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng |
825 |
else |
|
826 |
LIBSPLASHSCREEN_EXCLUDES += libpng |
|
23305 | 827 |
endif |
828 |
||
20547 | 829 |
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
|
830 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen |
20547 | 831 |
else |
25859 | 832 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen |
20547 | 833 |
endif |
834 |
||
30325
1472b22475f2
8078245: AARCH64: JDK fails to build due to undefined symbol in libpng
enevill
parents:
29931
diff
changeset
|
835 |
LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \ |
25859 | 836 |
$(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \ |
837 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
838 |
# |
|
20547 | 839 |
|
840 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
841 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
|
25859 | 842 |
LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp |
20547 | 843 |
|
25859 | 844 |
BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
845 |
BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
|
846 |
BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
|
847 |
BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
|
848 |
BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0 |
|
849 |
BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 |
|
850 |
BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 |
|
20547 | 851 |
|
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
852 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
853 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 |
20547 | 854 |
else |
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
855 |
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) |
20547 | 856 |
endif |
857 |
||
858 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX := |
|
859 |
||
860 |
ifneq ($(USE_EXTERNAL_LIBZ), true) |
|
25859 | 861 |
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8 |
20547 | 862 |
LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS) |
863 |
endif |
|
864 |
||
865 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
27565 | 866 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += \ |
867 |
-L$(INSTALL_LIBRARIES_HERE) \ |
|
868 |
$(LIBM) -lpthread -liconv -losxapp \ |
|
20547 | 869 |
-framework ApplicationServices \ |
870 |
-framework Foundation \ |
|
871 |
-framework Cocoa \ |
|
872 |
-framework JavaNativeFoundation |
|
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
873 |
else ifeq ($(OPENJDK_TARGET_OS), windows) |
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
874 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll |
23592
35b16ae6b4f4
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23310
diff
changeset
|
875 |
else |
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
876 |
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread |
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
877 |
endif |
20547 | 878 |
|
25859 | 879 |
$(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \ |
20547 | 880 |
LIBRARY := splashscreen, \ |
881 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
882 |
SRC := $(LIBSPLASHSCREEN_DIRS), \ |
|
883 |
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
|
25859 | 884 |
EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \ |
20547 | 885 |
OPTIMIZATION := LOW, \ |
23305 | 886 |
CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
25103 | 887 |
$(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
|
888 |
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
|
889 |
DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
30434 | 890 |
DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE, \ |
30502
50552a5900a2
8080317: Disable warning treated as error for signed/unsigned comparison in building splashscreen
prr
parents:
30439
diff
changeset
|
891 |
DISABLED_WARNINGS_microsoft := 4018 4244 4267, \ |
21805 | 892 |
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ |
20547 | 893 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
894 |
$(call SET_SHARED_LIBRARY_ORIGIN), \ |
|
23305 | 895 |
LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ |
25103 | 896 |
$(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \ |
20547 | 897 |
LDFLAGS_SUFFIX_solaris := -lc, \ |
25859 | 898 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 899 |
RC_FLAGS := $(RC_FLAGS) \ |
900 |
-D "JDK_FNAME=splashscreen.dll" \ |
|
901 |
-D "JDK_INTERNAL_NAME=splashscreen" \ |
|
902 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 903 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \ |
20547 | 904 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
905 |
||
27565 | 906 |
TARGETS += $(BUILD_LIBSPLASHSCREEN) |
20547 | 907 |
|
908 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
25859 | 909 |
$(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) |
20547 | 910 |
endif |
911 |
||
912 |
endif |
|
913 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
914 |
################################################################################ |
20547 | 915 |
|
916 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
917 |
||
25859 | 918 |
LIBAWT_LWAWT_DIRS := \ |
919 |
$(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
|
920 |
$(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \ |
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
921 |
$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
70bac69b37c9
8056216: Remove "sun" directory layer from libawt and common
prr
parents:
26741
diff
changeset
|
922 |
$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
25859 | 923 |
# |
20547 | 924 |
|
25859 | 925 |
LIBAWT_LWAWT_CFLAGS := \ |
926 |
$(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \ |
|
27565 | 927 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
25859 | 928 |
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \ |
929 |
-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
|
930 |
-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
|
931 |
-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
|
932 |
-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
|
933 |
-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
|
934 |
-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
|
935 |
-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
|
936 |
-I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \ |
25859 | 937 |
-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
|
938 |
-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
|
939 |
-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
|
940 |
-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
|
941 |
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
25859 | 942 |
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
943 |
$(LIBJAVA_HEADER_FLAGS) \ |
|
944 |
# |
|
20547 | 945 |
|
26741 | 946 |
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
|
947 |
LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib |
20547 | 948 |
|
949 |
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \ |
|
950 |
LIBRARY := awt_lwawt, \ |
|
951 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
952 |
SRC := $(LIBAWT_LWAWT_DIRS), \ |
|
953 |
INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \ |
|
25859 | 954 |
EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \ |
955 |
EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
|
20547 | 956 |
OPTIMIZATION := LOW, \ |
957 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
20901
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
958 |
$(X_CFLAGS) \ |
70f69e624fc9
8026888: Licensee build failure due to wrong libs being called
erikj
parents:
20899
diff
changeset
|
959 |
$(X_LIBS) \ |
25859 | 960 |
$(LIBAWT_LWAWT_CFLAGS), \ |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
961 |
DISABLED_WARNINGS_clang := incomplete-implementation \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
29006
diff
changeset
|
962 |
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
|
963 |
incompatible-pointer-types parentheses-equality extra-tokens, \ |
30434 | 964 |
WARNINGS_AS_ERRORS_clang := false, \ |
20547 | 965 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
27565 | 966 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
27944 | 967 |
-L$(INSTALL_LIBRARIES_HERE), \ |
20547 | 968 |
LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \ |
969 |
-framework Accelerate \ |
|
970 |
-framework ApplicationServices \ |
|
971 |
-framework AudioToolbox \ |
|
972 |
-framework Carbon \ |
|
973 |
-framework Cocoa \ |
|
974 |
-framework Security \ |
|
975 |
-framework ExceptionHandling \ |
|
976 |
-framework JavaNativeFoundation \ |
|
977 |
-framework JavaRuntimeSupport \ |
|
978 |
-framework OpenGL \ |
|
979 |
-framework QuartzCore -ljava, \ |
|
27565 | 980 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_lwawt, \ |
20547 | 981 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
982 |
||
27565 | 983 |
TARGETS += $(BUILD_LIBAWT_LWAWT) |
20547 | 984 |
|
985 |
$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT) |
|
986 |
||
987 |
$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE) |
|
988 |
||
989 |
$(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP) |
|
990 |
||
27565 | 991 |
$(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java) |
20547 | 992 |
|
993 |
endif |
|
994 |
||
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
995 |
################################################################################ |
20547 | 996 |
|
997 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
998 |
||
999 |
$(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \ |
|
1000 |
LIBRARY := osxui, \ |
|
1001 |
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
25859 | 1002 |
SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \ |
20547 | 1003 |
OPTIMIZATION := LOW, \ |
1004 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
|
25859 | 1005 |
-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
|
1006 |
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ |
25859 | 1007 |
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
1008 |
-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
|
1009 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
27565 | 1010 |
-I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
20547 | 1011 |
LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1012 |
$(call SET_SHARED_LIBRARY_ORIGIN) \ |
|
27565 | 1013 |
-Xlinker -rpath -Xlinker @loader_path \ |
27944 | 1014 |
-L$(INSTALL_LIBRARIES_HERE), \ |
20547 | 1015 |
LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \ |
1016 |
-framework Cocoa \ |
|
1017 |
-framework Carbon \ |
|
1018 |
-framework ApplicationServices \ |
|
1019 |
-framework JavaNativeFoundation \ |
|
1020 |
-framework JavaRuntimeSupport \ |
|
1021 |
-ljava -ljvm, \ |
|
27565 | 1022 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui, \ |
20547 | 1023 |
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
1024 |
||
27565 | 1025 |
TARGETS += $(BUILD_LIBOSXUI) |
20547 | 1026 |
|
1027 |
$(BUILD_LIBOSXUI): $(BUILD_LIBAWT) |
|
1028 |
||
1029 |
$(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP) |
|
1030 |
||
1031 |
$(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT) |
|
1032 |
||
27565 | 1033 |
#$(BUILD_LIBOSXUI): $(call FindLib, java.base, java) |
20547 | 1034 |
|
1035 |
endif |
|
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
1036 |
|
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
1037 |
################################################################################ |
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
1038 |
|
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
1039 |
# Hook to include the corresponding custom file, if present. |
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25993
diff
changeset
|
1040 |
$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk)) |