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