Print this page
rev 54883 : JDK-8220154 Improve java2d rendering performance on macOS by using Metal framework
| Split |
Close |
| Expand all |
| Collapse all |
--- old/make/lib/Awt2dLibraries.gmk
+++ new/make/lib/Awt2dLibraries.gmk
1 1 #
2 2 # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation. Oracle designates this
8 8 # particular file as subject to the "Classpath" exception as provided
9 9 # by Oracle in the LICENSE file that accompanied this code.
10 10 #
11 11 # This code is distributed in the hope that it will be useful, but WITHOUT
12 12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 14 # version 2 for more details (a copy is included in the LICENSE file that
15 15 # accompanied this code).
16 16 #
17 17 # You should have received a copy of the GNU General Public License version
18 18 # 2 along with this work; if not, write to the Free Software Foundation,
19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 20 #
21 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 22 # or visit www.oracle.com if you need additional information or have any
23 23 # questions.
24 24 #
25 25
26 26 $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
27 27
28 28 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
29 29
30 30 LIBAWT_DEFAULT_HEADER_DIRS := \
31 31 libawt/awt/image \
32 32 libawt/awt/image/cvutils \
33 33 libawt/java2d \
34 34 libawt/java2d/loops \
35 35 libawt/java2d/pipe \
36 36 #
37 37
38 38 ################################################################################
39 39
40 40 # We must not include java.desktop/unix/native/libmlib_image, which is only
41 41 # for usage by solaris-sparc in libmlib_image_v.
42 42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix
43 43
44 44 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
45 45
46 46 ifeq ($(call isTargetCpuBits, 64), true)
47 47 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
48 48 endif
49 49
50 50 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
51 51 NAME := mlib_image, \
52 52 EXTRA_SRC := common/awt/medialib, \
53 53 EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
54 54 EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
55 55 OPTIMIZATION := HIGHEST, \
56 56 CFLAGS := $(CFLAGS_JDKLIB) \
57 57 $(BUILD_LIBMLIB_CFLAGS), \
58 58 DISABLED_WARNINGS_gcc := unused-function, \
59 59 LDFLAGS := $(LDFLAGS_JDKLIB) \
60 60 $(call SET_SHARED_LIBRARY_ORIGIN), \
61 61 LIBS := $(JDKLIB_LIBS), \
62 62 LIBS_unix := $(LIBM) $(LIBDL), \
63 63 ))
64 64
65 65 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
66 66
67 67 TARGETS += $(BUILD_LIBMLIB_IMAGE)
68 68
69 69 ################################################################################
70 70
71 71 ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpuArch, sparc)), true)
72 72
73 73 # libmlib_image_v is basically built from mlib_image sources, with some additions
74 74 # and some exclusions.
75 75 LIBMLIB_IMAGE_V_SRC := \
76 76 libmlib_image \
77 77 common/awt/medialib \
78 78 #
79 79
80 80 LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
81 81 $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
82 82
83 83 ifeq ($(call isTargetCpuBits, 64), true)
84 84 LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
85 85 endif
86 86
87 87 BUILD_LIBMLIB_IMAGE_V_EXFILES := \
88 88 awt_ImagingLib.c \
89 89 mlib_c_ImageAffine_BC.c \
90 90 mlib_c_ImageAffine_BC_S16.c \
91 91 mlib_c_ImageAffine_BC_U16.c \
92 92 mlib_c_ImageAffine_BL.c \
93 93 mlib_c_ImageAffine_BL_S16.c \
94 94 mlib_c_ImageAffine_BL_U16.c \
95 95 mlib_c_ImageAffine_NN.c \
96 96 mlib_c_ImageConvClearEdge.c \
97 97 mlib_c_ImageConvCopyEdge.c \
98 98 mlib_c_ImageConv_f.c \
99 99 mlib_c_ImageConvVersion.c \
100 100 mlib_c_ImageCopy.c \
101 101 mlib_c_ImageLookUp.c \
102 102 mlib_c_ImageLookUp_f.c \
103 103 #
104 104
105 105 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
106 106 NAME := mlib_image_v, \
107 107 SRC := $(LIBMLIB_IMAGE_V_SRC), \
108 108 EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
109 109 OPTIMIZATION := HIGHEST, \
110 110 CFLAGS := $(CFLAGS_JDKLIB) \
111 111 $(LIBMLIB_IMAGE_V_CFLAGS), \
112 112 LDFLAGS := $(LDFLAGS_JDKLIB) \
113 113 $(call SET_SHARED_LIBRARY_ORIGIN), \
114 114 LIBS := -ljava -ljvm $(LIBM) $(LIBDL), \
115 115 ))
116 116
117 117 $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
118 118
119 119 TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
120 120
121 121 endif
122 122
123 123 ################################################################################
124 124
125 125 LIBAWT_EXTRA_SRC := \
126 126 common/awt/debug \
127 127 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
128 128 #
129 129
130 130 ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpuArch, sparc)), true)
131 131 LIBAWT_EXTRA_SRC += $(TOPDIR)/src/$(MODULE)/share/native/common/awt/medialib
132 132 endif
133 133
134 134 ifeq ($(call isTargetOs, windows), true)
135 135 LIBAWT_EXTRA_SRC += \
136 136 $(TOPDIR)/src/$(MODULE)/share/native/common/awt/utility \
137 137 $(TOPDIR)/src/$(MODULE)/share/native/common/font \
138 138 $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
139 139 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
140 140 #
141 141 endif
142 142
143 143 ifeq ($(call isTargetOs, solaris linux macosx aix), true)
144 144 LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
145 145 endif
146 146
147 147 ifeq ($(call isTargetOs, macosx), true)
148 148 LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
149 149 endif
150 150
151 151 ifeq ($(call isTargetOs, windows), true)
152 152 LIBAWT_EXFILES += \
153 153 java2d/d3d/D3DShaderGen.c \
154 154 awt/image/cvutils/img_colors.c \
155 155 #
156 156 endif
157 157
158 158 ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
159 159 LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
160 160 else
161 161 LIBAWT_EXCLUDES += \
162 162 $(TOPDIR)/src/$(MODULE)/unix/native/libawt/awt/medialib \
163 163 $(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
164 164 $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
165 165 #
166 166 endif
167 167
168 168 LIBAWT_EXTRA_HEADER_DIRS := \
169 169 $(LIBAWT_DEFAULT_HEADER_DIRS) \
170 170 $(call GetJavaHeaderDir, java.base) \
171 171 libawt/awt/medialib \
172 172 libawt/java2d/d3d \
173 173 libawt/java2d/opengl \
174 174 libawt/java2d/windows \
175 175 libawt/windows \
176 176 common/awt/medialib \
177 177 libmlib_image \
178 178 include \
179 179 java.base:libjava \
180 180 java.base:include \
181 181 #
182 182
183 183 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
184 184
185 185 ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
186 186 LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
187 187 $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
188 188
189 189 LIBAWT_ASFLAGS = -P -xarch=v9a
190 190 endif
191 191
192 192 ifeq ($(call isTargetOs, solaris), false)
193 193 LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
194 194 endif
195 195
196 196 ifeq ($(call isTargetOs, windows), true)
197 197 LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
198 198 ifeq ($(call isTargetCpuBits, 64), true)
199 199 LIBAWT_CFLAGS += -DMLIB_OS64BIT
200 200 endif
201 201
202 202 LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
203 203 LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
204 204 endif
205 205
206 206 ifeq ($(call isTargetOs, linux), true)
207 207 # FIXME: This is probably not what we want to do, but keep it now for compatibility.
208 208 LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
209 209 endif
210 210
211 211 # Turn off all warnings for debug_mem.c This is needed because the specific warning
212 212 # about initializing a declared 'extern' cannot be turned off individually. Only
213 213 # applies to debug builds.
214 214 ifeq ($(TOOLCHAIN_TYPE), gcc)
215 215 BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
216 216 # This option improves performance of MaskFill in Java2D by 20% for some gcc
217 217 LIBAWT_CFLAGS += -fgcse-after-reload
218 218 endif
219 219
220 220 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
221 221 NAME := awt, \
222 222 EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
223 223 EXCLUDES := $(LIBAWT_EXCLUDES), \
224 224 EXCLUDE_FILES := $(LIBAWT_EXFILES), \
225 225 OPTIMIZATION := LOW, \
226 226 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
227 227 EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
228 228 DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
229 229 format-nonliteral parentheses unused-value unused-function, \
230 230 DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \
231 231 sign-compare format-nonliteral, \
232 232 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
233 233 DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
234 234 ASFLAGS := $(LIBAWT_ASFLAGS), \
235 235 LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
236 236 LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
237 237 LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
238 238 -delayload:shell32.dll -delayload:winmm.dll \
|
↓ open down ↓ |
238 lines elided |
↑ open up ↑ |
239 239 -delayload:winspool.drv -delayload:imm32.dll \
240 240 -delayload:ole32.dll -delayload:comdlg32.dll \
241 241 -delayload:comctl32.dll -delayload:shlwapi.dll, \
242 242 LIBS_unix := -ljvm -ljava $(LIBM), \
243 243 LIBS_linux := $(LIBDL), \
244 244 LIBS_solaris := $(LIBDL), \
245 245 LIBS_aix := $(LIBDL),\
246 246 LIBS_macosx := -lmlib_image \
247 247 -framework Cocoa \
248 248 -framework OpenGL \
249 + -framework Metal \
250 + -framework MetalKit \
249 251 -framework JavaNativeFoundation \
250 252 -framework JavaRuntimeSupport \
251 253 -framework ApplicationServices \
252 254 -framework AudioToolbox, \
253 255 LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
254 256 imm32.lib ole32.lib uuid.lib shell32.lib \
255 257 comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
256 258 delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
257 259 VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
258 260 RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
259 261 -D "JDK_FNAME=awt.dll" \
260 262 -D "JDK_INTERNAL_NAME=awt" \
261 263 -D "JDK_FTYPE=0x2L", \
262 264 ))
263 265
264 266 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
265 267
266 268 ifeq ($(call isTargetOs, macosx), true)
267 269 $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
268 270 endif
269 271
270 272 TARGETS += $(BUILD_LIBAWT)
271 273
272 274 ################################################################################
273 275
274 276 ifeq ($(call isTargetOs, windows macosx), false)
275 277 ifeq ($(ENABLE_HEADLESS_ONLY), false)
276 278
277 279 LIBAWT_XAWT_EXTRA_SRC := \
278 280 common/awt \
279 281 common/java2d \
280 282 common/font \
281 283 #
282 284
283 285 LIBAWT_XAWT_EXCLUDES := medialib debug
284 286
285 287 LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
286 288 $(LIBAWT_DEFAULT_HEADER_DIRS) \
287 289 libawt_xawt/awt \
288 290 include \
289 291 common/awt/debug \
290 292 common/awt/systemscale \
291 293 common/font \
292 294 common/java2d/opengl \
293 295 common/java2d/x11 \
294 296 #
295 297
296 298 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
297 299 $(FONTCONFIG_CFLAGS) \
298 300 $(CUPS_CFLAGS)
299 301
300 302 ifeq ($(call isTargetOs, solaris), true)
301 303 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
302 304 endif
303 305
304 306 ifeq ($(call isTargetOs, linux), true)
305 307 ifeq ($(DISABLE_XRENDER), true)
306 308 LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
307 309 endif
308 310 endif
309 311
310 312 LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm
311 313
312 314 ifeq ($(call isTargetOs, linux), true)
313 315 LIBAWT_XAWT_LIBS += -lpthread
314 316 endif
315 317
316 318 ifeq ($(TOOLCHAIN_TYPE), gcc)
317 319 # Turn off all warnings for the following files since they contain warnings
318 320 # that cannot be turned of individually.
319 321 # redefining a macro
320 322 BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w
321 323 # comparison between pointer and integer
322 324 BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
323 325 # initializing a declared 'extern'
324 326 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
325 327 endif
326 328
327 329 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
328 330 NAME := awt_xawt, \
329 331 EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
330 332 EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
331 333 EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
332 334 OPTIMIZATION := LOW, \
333 335 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
334 336 $(X_CFLAGS), \
335 337 WARNINGS_AS_ERRORS_xlc := false, \
336 338 DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
337 339 unused-result maybe-uninitialized format \
338 340 format-security int-to-pointer-cast parentheses \
339 341 implicit-fallthrough undef unused-function, \
340 342 DISABLED_WARNINGS_clang := parentheses format undef \
341 343 logical-op-parentheses format-nonliteral int-conversion, \
342 344 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
343 345 E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
344 346 LDFLAGS := $(LDFLAGS_JDKLIB) \
345 347 $(call SET_SHARED_LIBRARY_ORIGIN) \
346 348 -L$(INSTALL_LIBRARIES_HERE), \
347 349 LIBS := $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
348 350 ))
349 351
350 352 $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
351 353
352 354 $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
353 355
354 356 TARGETS += $(BUILD_LIBAWT_XAWT)
355 357
356 358 endif
357 359 endif
358 360
359 361 ################################################################################
360 362
361 363 # The fast floor code loses precision.
362 364 LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
363 365
364 366 ifeq ($(USE_EXTERNAL_LCMS), true)
365 367 # If we're using an external library, we'll just need the wrapper part.
366 368 # By including it explicitly, all other files will be excluded.
367 369 BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
368 370 # If we're using an external library, we can't include our own SRC path
369 371 # as includes, instead the system headers should be used.
370 372 LIBLCMS_HEADERS_FROM_SRC := false
371 373 else
372 374 BUILD_LIBLCMS_INCLUDE_FILES :=
373 375 endif
374 376
375 377 $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
376 378 NAME := lcms, \
377 379 INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
378 380 OPTIMIZATION := HIGHEST, \
379 381 CFLAGS := $(CFLAGS_JDKLIB) \
380 382 $(LCMS_CFLAGS), \
381 383 CFLAGS_solaris := -xc99=no_lib, \
382 384 CFLAGS_windows := -DCMS_IS_WINDOWS_, \
383 385 EXTRA_HEADER_DIRS := \
384 386 common/awt/debug \
385 387 libawt/java2d, \
386 388 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
387 389 DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
388 390 misleading-indentation undef unused-function, \
389 391 DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
390 392 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
391 393 DISABLED_WARNINGS_microsoft := 4819, \
392 394 LDFLAGS := $(LDFLAGS_JDKLIB) \
393 395 $(call SET_SHARED_LIBRARY_ORIGIN), \
394 396 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
395 397 LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
396 398 LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
397 399 ))
398 400
399 401 TARGETS += $(BUILD_LIBLCMS)
400 402
401 403 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
402 404
403 405 ################################################################################
404 406
405 407 # "DISABLED_WARNINGS_gcc := clobbered" rationale:
406 408 # Suppress gcc warnings like "variable might be clobbered by 'longjmp'
407 409 # or 'vfork'": this warning indicates that some variable is placed to
408 410 # a register by optimized compiler and it's value might be lost on longjmp().
409 411 # Recommended way to avoid such warning is to declare the variable as
410 412 # volatile to prevent the optimization. However, this approach does not
411 413 # work because we have to declare all variables as volatile in result.
412 414
413 415 ifeq ($(USE_EXTERNAL_LIBJPEG), true)
414 416 LIBJPEG_LIBS := -ljpeg
415 417 BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
416 418 imageioJPEG.c \
417 419 jpegdecoder.c
418 420 # If we're using an external library, we can't include our own SRC path
419 421 # as includes, instead the system headers should be used.
420 422 LIBJPEG_HEADERS_FROM_SRC := false
421 423 else
422 424 LIBJPEG_LIBS :=
423 425 BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
424 426 endif
425 427
426 428 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
427 429 NAME := javajpeg, \
428 430 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
429 431 OPTIMIZATION := HIGHEST, \
430 432 CFLAGS := $(CFLAGS_JDKLIB), \
431 433 HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
432 434 DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
433 435 LDFLAGS := $(LDFLAGS_JDKLIB) \
434 436 $(call SET_SHARED_LIBRARY_ORIGIN), \
435 437 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
436 438 LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
437 439 ))
438 440
439 441 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
440 442
441 443 TARGETS += $(BUILD_LIBJAVAJPEG)
442 444
443 445 ################################################################################
444 446
445 447 # Mac and Windows only use the native AWT lib, do not build libawt_headless
446 448 ifeq ($(call isTargetOs, windows macosx), false)
447 449
448 450 LIBAWT_HEADLESS_EXTRA_SRC := \
449 451 common/font \
450 452 common/java2d \
451 453 $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
452 454 #
453 455
454 456 LIBAWT_HEADLESS_EXCLUDES := medialib
455 457
456 458 LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
457 459 $(LIBAWT_DEFAULT_HEADER_DIRS) \
458 460 common/awt/debug \
459 461 common/font \
460 462 common/java2d/opengl \
461 463 #
462 464
463 465 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
464 466 -DHEADLESS=true
465 467
466 468 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
467 469 NAME := awt_headless, \
468 470 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
469 471 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
470 472 OPTIMIZATION := LOW, \
471 473 CFLAGS := $(CFLAGS_JDKLIB) \
472 474 $(LIBAWT_HEADLESS_CFLAGS), \
473 475 EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
474 476 DISABLED_WARNINGS_gcc := unused-function, \
475 477 DISABLED_WARNINGS_xlc := 1506-356, \
476 478 DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
477 479 LDFLAGS := $(LDFLAGS_JDKLIB) \
478 480 $(call SET_SHARED_LIBRARY_ORIGIN), \
479 481 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
480 482 LIBS_unix := -lawt -ljvm -ljava, \
481 483 LIBS_linux := $(LIBM) $(LIBDL), \
482 484 LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
483 485 ))
484 486
485 487 # AIX warning explanation:
486 488 # 1506-356 : (W) Compilation unit is empty.
487 489 # This happens during the headless build
488 490
489 491 $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
490 492
491 493 TARGETS += $(BUILD_LIBAWT_HEADLESS)
492 494
493 495 endif
494 496
495 497 ################################################################################
496 498
497 499 ifeq ($(FREETYPE_TO_USE), system)
498 500 # For use by libfontmanager:
499 501 LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS)
500 502 LIBFREETYPE_LIBS := $(FREETYPE_LIBS)
501 503 else
502 504 BUILD_LIBFREETYPE_HEADER_DIRS := $(TOPDIR)/src/$(MODULE)/share/native/libfreetype/include
503 505 BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS)
504 506
505 507 # For use by libfontmanager:
506 508 LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS)
507 509 ifeq ($(call isTargetOs, windows), true)
508 510 LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
509 511 # freetype now requires you to manually define this (see ftconfig.h)
510 512 BUILD_LIBFREETYPE_CFLAGS += -DDLL_EXPORT
511 513 else
512 514 LIBFREETYPE_LIBS := -lfreetype
513 515 endif
514 516
515 517 $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
516 518 NAME := freetype, \
517 519 OPTIMIZATION := HIGHEST, \
518 520 CFLAGS := $(CFLAGS_JDKLIB) \
519 521 $(BUILD_LIBFREETYPE_CFLAGS), \
520 522 EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
521 523 DISABLED_WARNINGS_solstudio := \
522 524 E_STATEMENT_NOT_REACHED \
523 525 E_END_OF_LOOP_CODE_NOT_REACHED, \
524 526 DISABLED_WARNINGS_microsoft := 4018 4267 4244 4312 4819, \
525 527 DISABLED_WARNINGS_gcc := implicit-fallthrough cast-function-type bad-function-cast, \
526 528 LDFLAGS := $(LDFLAGS_JDKLIB) \
527 529 $(call SET_SHARED_LIBRARY_ORIGIN), \
528 530 ))
529 531
530 532 TARGETS += $(BUILD_LIBFREETYPE)
531 533 endif
532 534
533 535 ###########################################################################
534 536
535 537 #### Begin harfbuzz configuration
536 538
537 539 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
538 540
539 541 ifeq ($(call isTargetOs, windows), false)
540 542 HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
541 543 -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
542 544 -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
543 545 endif
544 546 ifeq ($(call isTargetOs, linux macosx), true)
545 547 HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
546 548 endif
547 549 ifeq ($(call isTargetOs, solaris), true)
548 550 HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
549 551 endif
550 552 ifeq ($(call isTargetOs, macosx), true)
551 553 HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
552 554 endif
553 555 ifeq ($(call isTargetOs, macosx), false)
554 556 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
555 557 endif
556 558 # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
557 559 LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
558 560
559 561 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
560 562
561 563 #### End harfbuzz configuration
562 564
563 565 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
564 566 libfontmanager/harfbuzz \
565 567 libfontmanager/harfbuzz/hb-ucdn \
566 568 common/awt \
567 569 common/font \
568 570 libawt/java2d \
569 571 libawt/java2d/pipe \
570 572 libawt/java2d/loops \
571 573 #
572 574
573 575 LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
574 576 BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
575 577
576 578 LIBFONTMANAGER_OPTIMIZATION := HIGH
577 579
578 580 ifeq ($(call isTargetOs, windows), true)
579 581 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
580 582 X11TextRenderer.c
581 583 LIBFONTMANAGER_OPTIMIZATION := HIGHEST
582 584 else ifeq ($(call isTargetOs, macosx), true)
583 585 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
584 586 X11TextRenderer.c \
585 587 fontpath.c \
586 588 lcdglyph.c
587 589 else
588 590 LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
589 591 lcdglyph.c
590 592 endif
591 593
592 594 LIBFONTMANAGER_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
593 595
594 596 ifeq ($(TOOLCHAIN_TYPE), gcc)
595 597 # Turn off all warnings for sunFont.c. This is needed because the specific warning
596 598 # about discarding 'const' qualifier cannot be turned off individually.
597 599 BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
598 600 endif
599 601
600 602 # LDFLAGS clarification:
601 603 # Filter relevant linker flags disallowing unresolved symbols as we cannot
602 604 # build-time decide to which library to link against (libawt_headless or
603 605 # libawt_xawt). See JDK-8196516 for details.
604 606 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
605 607 NAME := fontmanager, \
606 608 EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
607 609 AccelGlyphCache.c, \
608 610 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
609 611 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
610 612 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
611 613 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
612 614 CFLAGS_windows = -DCC_NOEX, \
613 615 EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
614 616 WARNINGS_AS_ERRORS_xlc := false, \
615 617 DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
616 618 type-limits missing-field-initializers implicit-fallthrough \
617 619 strict-aliasing undef unused-function, \
618 620 DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
619 621 maybe-uninitialized class-memaccess, \
620 622 DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
621 623 tautological-constant-out-of-range-compare int-to-pointer-cast \
622 624 sign-compare undef missing-field-initializers, \
623 625 DISABLED_WARNINGS_C_solstudio = \
624 626 E_INTEGER_OVERFLOW_DETECTED \
625 627 E_ARG_INCOMPATIBLE_WITH_ARG_L \
626 628 E_ENUM_VAL_OVERFLOWS_INT_MAX, \
627 629 DISABLED_WARNINGS_CXX_solstudio := \
628 630 truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
629 631 hidevf w_novirtualdescr arrowrtn2 refmemnoconstr_aggr unknownpragma, \
630 632 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101 4068 4805 4138, \
631 633 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
632 634 $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
633 635 $(call SET_SHARED_LIBRARY_ORIGIN), \
634 636 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
635 637 LDFLAGS_aix := -Wl$(COMMA)-berok, \
636 638 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
637 639 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
638 640 LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \
639 641 -framework CoreGraphics, \
640 642 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
641 643 $(WIN_AWT_LIB), \
642 644 ))
643 645
644 646 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
645 647
646 648 ifeq ($(call isTargetOs, macosx), true)
647 649 $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
648 650 endif
649 651
650 652 ifeq ($(FREETYPE_TO_USE), bundled)
651 653 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
652 654 endif
653 655
654 656 TARGETS += $(BUILD_LIBFONTMANAGER)
655 657
656 658 ################################################################################
657 659
658 660 ifeq ($(call isTargetOs, windows), true)
659 661
660 662 LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE
661 663
662 664 LIBJAWT_EXTRA_HEADER_DIRS := \
663 665 include \
664 666 common/awt/debug \
665 667 libawt/awt/image/cvutils \
666 668 libawt/java2d \
667 669 libawt/java2d/windows \
668 670 libawt/windows \
669 671 java.base:include \
670 672 java.base:libjava \
671 673 #
672 674
673 675 ifeq ($(call isTargetCpu, x86), true)
674 676 KERNEL32_LIB := kernel32.lib
675 677 endif
676 678
677 679 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
678 680 NAME := jawt, \
679 681 OPTIMIZATION := LOW, \
680 682 CFLAGS := $(CXXFLAGS_JDKLIB) \
681 683 $(LIBJAWT_CFLAGS), \
682 684 EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
683 685 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
684 686 LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
685 687 ))
686 688
687 689 $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
688 690
689 691 $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
690 692 FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
691 693 DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
692 694 ))
693 695
694 696 $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
695 697
696 698 TARGETS += $(COPY_JAWT_LIB)
697 699
698 700 else # not windows
699 701
700 702 ifeq ($(call isTargetOs, macosx), true)
701 703 # libjawt on macosx do not use the unix code
702 704 LIBJAWT_EXCLUDE_SRC_PATTERNS := unix
703 705 endif
704 706
705 707 ifeq ($(call isTargetOs, macosx), true)
706 708 JAWT_LIBS := -lawt_lwawt
707 709 else
708 710 JAWT_LIBS :=
709 711 ifeq ($(call isTargetOs, solaris), false)
710 712 JAWT_LIBS += -lawt
711 713 endif
712 714 ifeq ($(ENABLE_HEADLESS_ONLY), false)
713 715 JAWT_LIBS += -lawt_xawt
714 716 else
715 717 JAWT_LIBS += -lawt_headless
716 718 ifeq ($(call isTargetOs, linux), true)
717 719 JAWT_CFLAGS += -DHEADLESS
718 720 endif
719 721 endif
720 722 endif
721 723
722 724 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
723 725 NAME := jawt, \
724 726 EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
725 727 INCLUDE_FILES := $(JAWT_FILES), \
726 728 OPTIMIZATION := LOW, \
727 729 CFLAGS := $(CFLAGS_JDKLIB) \
728 730 $(JAWT_CFLAGS), \
729 731 DISABLED_WARNINGS_clang := sign-compare, \
730 732 EXTRA_HEADER_DIRS := \
731 733 include \
732 734 common/awt, \
733 735 LDFLAGS := $(LDFLAGS_JDKLIB) \
734 736 $(call SET_SHARED_LIBRARY_ORIGIN), \
735 737 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
736 738 LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
737 739 LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
738 740 LIBS_solaris := $(X_LIBS) -lXrender, \
739 741 LIBS_macosx := -framework Cocoa, \
740 742 ))
741 743
742 744 ifeq ($(ENABLE_HEADLESS_ONLY), false)
743 745 $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
744 746 else
745 747 $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
746 748 endif
747 749
748 750 ifeq ($(call isTargetOs, macosx), true)
749 751 $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
750 752 endif
751 753
752 754 endif
753 755
754 756 TARGETS += $(BUILD_LIBJAWT)
755 757
756 758 ################################################################################
757 759
758 760 ifeq ($(ENABLE_HEADLESS_ONLY), false)
759 761
760 762 LIBSPLASHSCREEN_EXTRA_SRC := \
761 763 common/awt/systemscale \
762 764 #
763 765
764 766 ifeq ($(USE_EXTERNAL_LIBGIF), false)
765 767 LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/giflib
766 768 else
767 769 LIBSPLASHSCREEN_EXCLUDES := giflib
768 770 GIFLIB_LIBS := -lgif
769 771 endif
770 772
771 773 ifeq ($(USE_EXTERNAL_LIBJPEG), false)
772 774 # While the following ought to work, it will currently pull in the closed
773 775 # additions to this library, and this was not done previously in the build.
774 776 # LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
775 777 LIBSPLASHSCREEN_EXTRA_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
776 778 else
777 779 LIBJPEG_LIBS := -ljpeg
778 780 endif
779 781
780 782 ifeq ($(USE_EXTERNAL_LIBPNG), false)
781 783 LIBSPLASHSCREEN_HEADER_DIRS += libsplashscreen/libpng
782 784 else
783 785 LIBSPLASHSCREEN_EXCLUDES += libpng
784 786 endif
785 787
786 788 ifeq ($(USE_EXTERNAL_LIBZ), false)
787 789 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
788 790 endif
789 791
790 792 ifeq ($(call isTargetOs, macosx), true)
791 793 # libsplashscreen on macosx do not use the unix code
792 794 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
793 795 endif
794 796
795 797 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
796 798
797 799 ifeq ($(call isTargetOs, linux), true)
798 800 ifeq ($(call isTargetCpuArch, ppc), true)
799 801 LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
800 802 endif
801 803 endif
802 804
803 805 ifeq ($(call isTargetOs, macosx), true)
804 806 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
805 807
806 808 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
807 809 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
808 810 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
809 811 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
810 812 BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
811 813 BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
812 814 BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
813 815
814 816 else ifeq ($(call isTargetOs, windows), true)
815 817 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
816 818 else
817 819 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
|
↓ open down ↓ |
559 lines elided |
↑ open up ↑ |
818 820 endif
819 821
820 822 LIBSPLASHSCREEN_LIBS :=
821 823
822 824 ifeq ($(call isTargetOs, macosx), true)
823 825 LIBSPLASHSCREEN_LIBS += \
824 826 $(LIBM) -lpthread -liconv -losxapp \
825 827 -framework ApplicationServices \
826 828 -framework Foundation \
827 829 -framework Cocoa \
830 + -framework Metal \
831 + -framework MetalKit \
828 832 -framework JavaNativeFoundation
829 833 else ifeq ($(call isTargetOs, windows), true)
830 834 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
831 835 else
832 836 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
833 837 endif
834 838
835 839 LIBSPLASHSCREEN_HEADER_DIRS += \
836 840 libosxapp \
837 841 java.base:include \
838 842 java.base:libjava \
839 843 #
840 844
841 845 $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
842 846 NAME := splashscreen, \
843 847 EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
844 848 EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
845 849 EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
846 850 EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
847 851 OPTIMIZATION := LOW, \
848 852 CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
849 853 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
850 854 EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
851 855 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
852 856 maybe-uninitialized shift-negative-value implicit-fallthrough \
853 857 unused-function, \
854 858 DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare, \
855 859 DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
856 860 E_STATEMENT_NOT_REACHED, \
857 861 DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
858 862 LDFLAGS := $(LDFLAGS_JDKLIB) \
859 863 $(call SET_SHARED_LIBRARY_ORIGIN), \
860 864 LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
861 865 LDFLAGS_windows := -delayload:user32.dll, \
862 866 LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
863 867 $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
864 868 LIBS_aix := -liconv, \
865 869 ))
866 870
867 871 TARGETS += $(BUILD_LIBSPLASHSCREEN)
868 872
869 873 ifeq ($(call isTargetOs, macosx), true)
870 874 $(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp)
871 875 endif
872 876
873 877 endif
874 878
875 879 ################################################################################
876 880
877 881 ifeq ($(call isTargetOs, macosx), true)
878 882
879 883 LIBAWT_LWAWT_EXTRA_SRC := \
|
↓ open down ↓ |
42 lines elided |
↑ open up ↑ |
880 884 $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
881 885 $(TOPDIR)/src/$(MODULE)/share/native/common/font \
882 886 $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
883 887 #
884 888
885 889 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
886 890 $(LIBAWT_DEFAULT_HEADER_DIRS) \
887 891 libawt_lwawt/awt \
888 892 libawt_lwawt/font \
889 893 libawt_lwawt/java2d/opengl \
894 + libawt_lwawt/java2d/metal \
890 895 include \
891 896 common/awt/debug \
892 897 common/java2d/opengl \
893 898 libosxapp \
894 899 #
895 900
896 901 LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS)
897 902
898 903 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
899 904 LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
900 905
901 906 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
902 907 NAME := awt_lwawt, \
903 908 EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \
904 909 INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
905 910 EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
906 911 EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
907 912 OPTIMIZATION := LOW, \
908 913 CFLAGS := $(CFLAGS_JDKLIB) \
909 914 $(LIBAWT_LWAWT_CFLAGS), \
910 915 EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
911 916 DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
912 917 deprecated-declarations objc-method-access bitwise-op-parentheses \
913 918 incompatible-pointer-types parentheses-equality extra-tokens \
914 919 sign-compare semicolon-before-method-body format-nonliteral undef \
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
915 920 pointer-arith, \
916 921 LDFLAGS := $(LDFLAGS_JDKLIB) \
917 922 $(call SET_SHARED_LIBRARY_ORIGIN) \
918 923 -L$(INSTALL_LIBRARIES_HERE), \
919 924 LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
920 925 -framework Accelerate \
921 926 -framework ApplicationServices \
922 927 -framework AudioToolbox \
923 928 -framework Carbon \
924 929 -framework Cocoa \
930 + -framework Metal \
931 + -framework MetalKit \
925 932 -framework Security \
926 933 -framework ExceptionHandling \
927 934 -framework JavaNativeFoundation \
928 935 -framework JavaRuntimeSupport \
929 936 -framework OpenGL \
930 937 -framework QuartzCore -ljava, \
931 938 ))
932 939
933 940 TARGETS += $(BUILD_LIBAWT_LWAWT)
934 941
935 942 $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
936 943
937 944 $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
938 945
939 946 $(BUILD_LIBAWT_LWAWT): $(call FindLib, $(MODULE), osxapp)
940 947
941 948 $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
942 949
943 950 endif
944 951
945 952 ################################################################################
946 953
947 954 ifeq ($(call isTargetOs, macosx), true)
955 + XCODE_PATH := $(shell /usr/bin/xcode-select -p)
956 + CompileMetalShaders :
957 + $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal -O2 -std=osx-metal1.1 -o $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt/shaders.metal
958 + $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal-ar r $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air
959 + $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metallib -o $(INSTALL_LIBRARIES_HERE)/shaders.metallib $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar
948 960
949 961 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
950 962 NAME := osxui, \
951 963 OPTIMIZATION := LOW, \
952 964 CFLAGS := $(CFLAGS_JDKLIB), \
953 965 EXTRA_HEADER_DIRS := \
954 966 libawt_lwawt/awt \
955 967 libosxapp, \
956 968 DISABLED_WARNINGS_clang := deprecated-declarations sign-compare, \
957 969 LDFLAGS := $(LDFLAGS_JDKLIB) \
958 970 $(call SET_SHARED_LIBRARY_ORIGIN) \
959 971 -Wl$(COMMA)-rpath$(COMMA)@loader_path \
960 972 -L$(INSTALL_LIBRARIES_HERE), \
961 973 LIBS := -lawt -losxapp -lawt_lwawt \
962 974 -framework Cocoa \
975 + -framework Metal \
976 + -framework MetalKit \
977 + -framework OpenGL \
963 978 -framework Carbon \
964 979 -framework ApplicationServices \
965 980 -framework JavaNativeFoundation \
966 981 -framework JavaRuntimeSupport \
967 982 -ljava -ljvm, \
968 983 ))
969 984
970 985 TARGETS += $(BUILD_LIBOSXUI)
986 + $(BUILD_LIBOSXUI): CompileMetalShaders
971 987
972 988 $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
973 989
974 990 $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp)
975 991
976 992 $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
977 993
978 994 endif
979 995
980 996 ################################################################################
981 997
982 998 # Hook to include the corresponding custom file, if present.
983 999 $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX