32 BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
32 BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
33 $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib |
33 $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib |
34 |
34 |
35 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH |
35 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH |
36 |
36 |
37 BUILD_LIBMLIB_HEADER_FLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image |
|
38 |
|
39 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
37 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
40 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
38 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
41 endif |
39 endif |
42 |
40 |
43 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \ |
41 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \ |
45 SRC := $(BUILD_LIBMLIB_SRC), \ |
43 SRC := $(BUILD_LIBMLIB_SRC), \ |
46 EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ |
44 EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \ |
47 OPTIMIZATION := HIGHEST, \ |
45 OPTIMIZATION := HIGHEST, \ |
48 CFLAGS := $(CFLAGS_JDKLIB) \ |
46 CFLAGS := $(CFLAGS_JDKLIB) \ |
49 $(BUILD_LIBMLIB_CFLAGS), \ |
47 $(BUILD_LIBMLIB_CFLAGS), \ |
50 HEADER_FLAGS := $(BUILD_LIBMLIB_HEADER_FLAGS), \ |
|
51 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
48 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
52 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
49 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
53 LIBS := $(JDKLIB_LIBS), \ |
50 LIBS := $(JDKLIB_LIBS), \ |
54 LIBS_unix := $(LIBM) $(LIBDL), \ |
51 LIBS_unix := $(LIBM) $(LIBDL), \ |
55 )) |
52 )) |
134 |
131 |
135 ifeq ($(OPENJDK_TARGET_OS), macosx) |
132 ifeq ($(OPENJDK_TARGET_OS), macosx) |
136 LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c |
133 LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c |
137 endif |
134 endif |
138 |
135 |
139 LIBAWT_HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
140 $(LIBJAVA_HEADER_FLAGS) \ |
|
141 $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \ |
|
142 $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \ |
|
143 # |
|
144 # FIXME:LIBS: I wish this FIND was not needed. |
|
145 |
|
146 |
|
147 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS) |
136 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS) |
148 |
137 |
149 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
138 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
150 LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \ |
139 LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \ |
151 $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il |
140 $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il |
210 SRC := $(LIBAWT_DIRS), \ |
199 SRC := $(LIBAWT_DIRS), \ |
211 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
200 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
212 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
201 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
213 OPTIMIZATION := LOW, \ |
202 OPTIMIZATION := LOW, \ |
214 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
203 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
215 HEADER_FLAGS := $(LIBAWT_HEADER_FLAGS), \ |
204 HEADER_FLAGS := \ |
|
205 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
206 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
|
207 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, mlib_image)) \ |
|
208 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
209 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
210 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/medialib \ |
|
211 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
|
212 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops, \ |
216 DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ |
213 DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ |
217 format-nonliteral parentheses, \ |
214 format-nonliteral parentheses, \ |
218 DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ |
215 DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ |
219 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
216 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
220 DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \ |
217 DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \ |
275 LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale |
272 LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale |
276 endif |
273 endif |
277 |
274 |
278 LIBAWT_XAWT_EXCLUDES := medialib |
275 LIBAWT_XAWT_EXCLUDES := medialib |
279 |
276 |
280 LIBAWT_XAWT_HEADER_FLAGS := \ |
|
281 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
282 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
|
283 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
|
284 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ |
|
285 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
|
286 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \ |
|
287 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
288 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
|
289 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
290 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
291 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \ |
|
292 $(LIBJAVA_HEADER_FLAGS) \ |
|
293 $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ |
|
294 # |
|
295 # FIXME:LIBS: I wish this FIND was not needed!!! |
|
296 |
|
297 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
277 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
298 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
278 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
299 $(FONTCONFIG_CFLAGS) \ |
279 $(FONTCONFIG_CFLAGS) \ |
300 $(CUPS_CFLAGS) |
280 $(CUPS_CFLAGS) |
301 |
281 |
322 BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w |
302 BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w |
323 # comparison between pointer and integer |
303 # comparison between pointer and integer |
324 BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w |
304 BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w |
325 # initializing a declared 'extern' |
305 # initializing a declared 'extern' |
326 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
306 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
327 endif |
307 endif |
|
308 |
328 |
309 |
329 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
310 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
330 NAME := awt_xawt, \ |
311 NAME := awt_xawt, \ |
331 SRC := $(LIBAWT_XAWT_DIRS), \ |
312 SRC := $(LIBAWT_XAWT_DIRS), \ |
|
313 HEADER_FLAGS := \ |
|
314 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
315 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_xawt/awt)) \ |
|
316 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
|
317 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
|
318 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/x11)) \ |
|
319 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
|
320 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
|
321 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
322 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
323 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
324 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe, \ |
332 EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \ |
325 EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \ |
333 OPTIMIZATION := LOW, \ |
326 OPTIMIZATION := LOW, \ |
334 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
327 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ |
335 $(X_CFLAGS), \ |
328 $(X_CFLAGS), \ |
336 HEADER_FLAGS := $(LIBAWT_XAWT_HEADER_FLAGS), \ |
|
337 WARNINGS_AS_ERRORS_xlc := false, \ |
329 WARNINGS_AS_ERRORS_xlc := false, \ |
338 DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ |
330 DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ |
339 unused-result maybe-uninitialized format \ |
331 unused-result maybe-uninitialized format \ |
340 format-security int-to-pointer-cast parentheses \ |
332 format-security int-to-pointer-cast parentheses \ |
341 implicit-fallthrough, \ |
333 implicit-fallthrough, \ |
385 OPTIMIZATION := HIGHEST, \ |
372 OPTIMIZATION := HIGHEST, \ |
386 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
373 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
387 $(LCMS_CFLAGS), \ |
374 $(LCMS_CFLAGS), \ |
388 CFLAGS_solaris := -xc99=no_lib, \ |
375 CFLAGS_solaris := -xc99=no_lib, \ |
389 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
376 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
390 HEADER_FLAGS := $(LIBLCMS_HEADER_FLAGS), \ |
377 HEADER_FLAGS := \ |
|
378 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
379 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
|
380 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)), \ |
391 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
381 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
392 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
382 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
393 DISABLED_WARNINGS_clang := tautological-compare, \ |
383 DISABLED_WARNINGS_clang := tautological-compare, \ |
394 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
384 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
395 DISABLED_WARNINGS_microsoft := 4819, \ |
385 DISABLED_WARNINGS_microsoft := 4819, \ |
425 else |
415 else |
426 LIBJPEG_LIBS := |
416 LIBJPEG_LIBS := |
427 BUILD_LIBJAVAJPEG_INCLUDE_FILES := |
417 BUILD_LIBJAVAJPEG_INCLUDE_FILES := |
428 endif |
418 endif |
429 |
419 |
430 LIBJPEG_HEADER_FLAGS := \ |
|
431 $(LIBJAVA_HEADER_FLAGS) \ |
|
432 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
433 # |
|
434 |
|
435 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \ |
420 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \ |
436 NAME := javajpeg, \ |
421 NAME := javajpeg, \ |
437 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
422 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
438 OPTIMIZATION := HIGHEST, \ |
423 OPTIMIZATION := HIGHEST, \ |
439 CFLAGS := $(CFLAGS_JDKLIB), \ |
424 CFLAGS := $(CFLAGS_JDKLIB), \ |
440 HEADER_FLAGS := $(LIBJPEG_HEADER_FLAGS), \ |
425 HEADER_FLAGS := \ |
|
426 -I$(call FindHeaderDirForModule, $(MODULE)), \ |
441 HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \ |
427 HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \ |
442 DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ |
428 DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ |
443 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
429 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
444 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
430 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
445 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
431 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
461 $(TOPDIR)/src/java.desktop/share/native/common/java2d \ |
447 $(TOPDIR)/src/java.desktop/share/native/common/java2d \ |
462 $(TOPDIR)/src/java.desktop/share/native/common/font \ |
448 $(TOPDIR)/src/java.desktop/share/native/common/font \ |
463 # |
449 # |
464 |
450 |
465 LIBAWT_HEADLESS_EXCLUDES := medialib |
451 LIBAWT_HEADLESS_EXCLUDES := medialib |
466 LIBAWT_HEADLESS_HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
467 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
468 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
469 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
|
470 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \ |
|
471 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
472 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
|
473 -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
|
474 -I$(TOPDIR)/src/java.desktop/share/native/common/font \ |
|
475 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \ |
|
476 -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
|
477 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
|
478 $(LIBJAVA_HEADER_FLAGS) \ |
|
479 # |
|
480 |
|
481 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
452 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
482 -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
453 -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
483 |
454 |
484 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
455 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
485 NAME := awt_headless, \ |
456 NAME := awt_headless, \ |
486 SRC := $(LIBAWT_HEADLESS_DIRS), \ |
457 SRC := $(LIBAWT_HEADLESS_DIRS), \ |
487 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
458 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
488 OPTIMIZATION := LOW, \ |
459 OPTIMIZATION := LOW, \ |
489 CFLAGS := $(CFLAGS_JDKLIB) \ |
460 CFLAGS := $(CFLAGS_JDKLIB) \ |
490 $(LIBAWT_HEADLESS_CFLAGS), \ |
461 $(LIBAWT_HEADLESS_CFLAGS), \ |
491 HEADER_FLAGS := $(LIBAWT_HEADLESS_HEADER_FLAGS), \ |
462 HEADER_FLAGS := \ |
|
463 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
464 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
|
465 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
|
466 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
|
467 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
|
468 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
469 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
470 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
471 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe, \ |
492 DISABLED_WARNINGS_xlc := 1506-356, \ |
472 DISABLED_WARNINGS_xlc := 1506-356, \ |
493 DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \ |
473 DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \ |
494 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
474 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
495 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
475 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
496 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
476 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
544 TARGETS += $(BUILD_LIBFREETYPE) |
524 TARGETS += $(BUILD_LIBFREETYPE) |
545 endif |
525 endif |
546 |
526 |
547 ########################################################################### |
527 ########################################################################### |
548 |
528 |
549 LIBFONTMANAGER_HEADER_FLAGS := \ |
|
550 $(addprefix -I, $(shell $(FIND) \ |
|
551 $(TOPDIR)/src/java.desktop/share/native/libawt \ |
|
552 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
|
553 $(TOPDIR)/src/java.desktop/share/native/common \ |
|
554 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \ |
|
555 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
556 $(LIBJAVA_HEADER_FLAGS) \ |
|
557 # |
|
558 |
|
559 LIBFONTMANAGER_HEADER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \ |
529 LIBFONTMANAGER_HEADER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \ |
560 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager |
530 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager |
561 LIBFONTMANAGER_HEADER_FLAGS += \ |
531 LIBFONTMANAGER_HEADER_FLAGS += \ |
562 $(addprefix -I, $(shell $(FIND) $(LIBFONTMANAGER_HEADER_SRC) -type d)) \ |
532 $(addprefix -I, $(shell $(FIND) $(LIBFONTMANAGER_HEADER_SRC) -type d)) \ |
563 # |
533 # |
630 EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \ |
599 EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \ |
631 AccelGlyphCache.c, \ |
600 AccelGlyphCache.c, \ |
632 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
601 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
633 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
602 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
634 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
603 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
635 HEADER_FLAGS := $(LIBFONTMANAGER_HEADER_FLAGS), \ |
|
636 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
604 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
637 CFLAGS_windows = -DCC_NOEX, \ |
605 CFLAGS_windows = -DCC_NOEX, \ |
|
606 HEADER_FLAGS := \ |
|
607 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
608 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)) \ |
|
609 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
|
610 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
|
611 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz \ |
|
612 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn \ |
|
613 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
614 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe, \ |
638 WARNINGS_AS_ERRORS_xlc := false, \ |
615 WARNINGS_AS_ERRORS_xlc := false, \ |
639 DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ |
616 DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ |
640 type-limits missing-field-initializers implicit-fallthrough, \ |
617 type-limits missing-field-initializers implicit-fallthrough, \ |
641 DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ |
618 DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ |
642 maybe-uninitialized, \ |
619 maybe-uninitialized, \ |
681 |
658 |
682 ################################################################################ |
659 ################################################################################ |
683 |
660 |
684 ifeq ($(OPENJDK_TARGET_OS), windows) |
661 ifeq ($(OPENJDK_TARGET_OS), windows) |
685 |
662 |
686 LIBJAWT_HEADER_FLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \ |
|
687 -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
|
688 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
|
689 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
690 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \ |
|
691 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
692 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
|
693 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
|
694 $(LIBJAVA_HEADER_FLAGS) \ |
|
695 # |
|
696 |
|
697 LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE |
663 LIBJAWT_CFLAGS := -EHsc -DUNICODE -D_UNICODE |
698 |
664 |
699 ifeq ($(OPENJDK_TARGET_CPU), x86) |
665 ifeq ($(OPENJDK_TARGET_CPU), x86) |
700 KERNEL32_LIB := kernel32.lib |
666 KERNEL32_LIB := kernel32.lib |
701 endif |
667 endif |
727 ifeq ($(OPENJDK_TARGET_OS), macosx) |
693 ifeq ($(OPENJDK_TARGET_OS), macosx) |
728 LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt |
694 LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt |
729 else |
695 else |
730 LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt |
696 LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt |
731 endif |
697 endif |
732 |
|
733 LIBJAWT_HEADER_FLAGS := \ |
|
734 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
|
735 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
|
736 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ |
|
737 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
|
738 $(LIBJAVA_HEADER_FLAGS) \ |
|
739 # |
|
740 |
698 |
741 ifeq ($(OPENJDK_TARGET_OS), macosx) |
699 ifeq ($(OPENJDK_TARGET_OS), macosx) |
742 JAWT_LIBS := -lawt_lwawt |
700 JAWT_LIBS := -lawt_lwawt |
743 else |
701 else |
744 JAWT_LIBS := |
702 JAWT_LIBS := |
760 SRC := $(LIBJAWT_SRC), \ |
718 SRC := $(LIBJAWT_SRC), \ |
761 INCLUDE_FILES := $(JAWT_FILES), \ |
719 INCLUDE_FILES := $(JAWT_FILES), \ |
762 OPTIMIZATION := LOW, \ |
720 OPTIMIZATION := LOW, \ |
763 CFLAGS := $(CFLAGS_JDKLIB) \ |
721 CFLAGS := $(CFLAGS_JDKLIB) \ |
764 $(JAWT_CFLAGS), \ |
722 $(JAWT_CFLAGS), \ |
765 HEADER_FLAGS := $(LIBJAWT_HEADER_FLAGS), \ |
723 HEADER_FLAGS := \ |
|
724 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
|
725 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)), \ |
766 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
726 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
767 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
727 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
768 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
728 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
769 LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \ |
729 LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \ |
770 LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ |
730 LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ |
828 ifeq ($(OPENJDK_TARGET_OS), windows) |
788 ifeq ($(OPENJDK_TARGET_OS), windows) |
829 LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale |
789 LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale |
830 endif |
790 endif |
831 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
791 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
832 |
792 |
833 LIBSPLASHSCREEN_HEADER_FLAGS += $(LIBJAVA_HEADER_FLAGS) |
|
834 |
|
835 ifeq ($(OPENJDK_TARGET_OS), macosx) |
793 ifeq ($(OPENJDK_TARGET_OS), macosx) |
836 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
794 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
837 LIBSPLASHSCREEN_HEADER_FLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
795 # LIBSPLASHSCREEN_HEADER_FLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
838 |
796 |
839 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
797 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
840 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
798 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
841 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
799 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
842 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
800 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
885 EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
843 EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
886 EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \ |
844 EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \ |
887 OPTIMIZATION := LOW, \ |
845 OPTIMIZATION := LOW, \ |
888 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
846 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
889 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
847 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
890 HEADER_FLAGS := $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
848 HEADER_FLAGS := \ |
|
849 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
850 $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
891 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
851 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
892 maybe-uninitialized shift-negative-value implicit-fallthrough, \ |
852 maybe-uninitialized shift-negative-value implicit-fallthrough, \ |
893 DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
853 DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
894 DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ |
854 DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ |
895 E_STATEMENT_NOT_REACHED, \ |
855 E_STATEMENT_NOT_REACHED, \ |
918 LIBAWT_LWAWT_DIRS := \ |
878 LIBAWT_LWAWT_DIRS := \ |
919 $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \ |
879 $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \ |
920 $(TOPDIR)/src/java.desktop/unix/native/common/awt \ |
880 $(TOPDIR)/src/java.desktop/unix/native/common/awt \ |
921 $(TOPDIR)/src/java.desktop/share/native/common/font \ |
881 $(TOPDIR)/src/java.desktop/share/native/common/font \ |
922 $(TOPDIR)/src/java.desktop/share/native/common/java2d \ |
882 $(TOPDIR)/src/java.desktop/share/native/common/java2d \ |
923 # |
|
924 |
|
925 LIBAWT_LWAWT_HEADER_FLAGS := \ |
|
926 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
927 -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ |
|
928 -I$(TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \ |
|
929 -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \ |
|
930 -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \ |
|
931 -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
|
932 -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
|
933 -I$(TOPDIR)/src/java.desktop/macosx/native/include \ |
|
934 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
|
935 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
|
936 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
|
937 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
|
938 -I$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d \ |
|
939 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
|
940 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
|
941 -I$(TOPDIR)/src/java.desktop/share/native/libmlib_image/ \ |
|
942 -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
|
943 $(LIBJAVA_HEADER_FLAGS) \ |
|
944 # |
883 # |
945 |
884 |
946 LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS) |
885 LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS) |
947 |
886 |
948 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
887 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |