289 common/java2d/opengl \ |
289 common/java2d/opengl \ |
290 common/java2d/x11 \ |
290 common/java2d/x11 \ |
291 # |
291 # |
292 |
292 |
293 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
293 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
294 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
|
295 $(FONTCONFIG_CFLAGS) \ |
294 $(FONTCONFIG_CFLAGS) \ |
296 $(CUPS_CFLAGS) |
295 $(CUPS_CFLAGS) |
297 |
296 |
298 ifeq ($(OPENJDK_TARGET_OS), solaris) |
297 ifeq ($(OPENJDK_TARGET_OS), solaris) |
299 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
298 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 |
355 ################################################################################ |
354 ################################################################################ |
356 |
355 |
357 # The fast floor code loses precision. |
356 # The fast floor code loses precision. |
358 LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR |
357 LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR |
359 |
358 |
360 LCMS_CFLAGS_JDKLIB := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) |
|
361 |
|
362 ifeq ($(USE_EXTERNAL_LCMS), true) |
359 ifeq ($(USE_EXTERNAL_LCMS), true) |
363 # If we're using an external library, we'll just need the wrapper part. |
360 # If we're using an external library, we'll just need the wrapper part. |
364 # By including it explicitly, all other files will be excluded. |
361 # By including it explicitly, all other files will be excluded. |
365 BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c |
362 BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c |
366 # If we're using an external library, we can't include our own SRC path |
363 # If we're using an external library, we can't include our own SRC path |
372 |
369 |
373 $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \ |
370 $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \ |
374 NAME := lcms, \ |
371 NAME := lcms, \ |
375 INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
372 INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
376 OPTIMIZATION := HIGHEST, \ |
373 OPTIMIZATION := HIGHEST, \ |
377 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
374 CFLAGS := $(CFLAGS_JDKLIB) \ |
378 $(LCMS_CFLAGS), \ |
375 $(LCMS_CFLAGS), \ |
379 CFLAGS_solaris := -xc99=no_lib, \ |
376 CFLAGS_solaris := -xc99=no_lib, \ |
380 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
377 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
381 EXTRA_HEADER_DIRS := \ |
378 EXTRA_HEADER_DIRS := \ |
382 common/awt/debug \ |
379 common/awt/debug \ |
456 common/font \ |
453 common/font \ |
457 common/java2d/opengl \ |
454 common/java2d/opengl \ |
458 # |
455 # |
459 |
456 |
460 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
457 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
461 -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
458 -DHEADLESS=true |
462 |
459 |
463 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
460 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
464 NAME := awt_headless, \ |
461 NAME := awt_headless, \ |
465 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
462 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
466 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
463 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
525 |
522 |
526 ########################################################################### |
523 ########################################################################### |
527 |
524 |
528 #### Begin harfbuzz configuration |
525 #### Begin harfbuzz configuration |
529 |
526 |
530 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN |
527 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND |
531 |
528 |
532 ifneq ($(OPENJDK_TARGET_OS), windows) |
529 ifneq ($(OPENJDK_TARGET_OS), windows) |
533 HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ |
530 HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \ |
534 -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H |
531 -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H |
535 endif |
532 endif |
585 |
582 |
586 ifeq ($(TOOLCHAIN_TYPE), gcc) |
583 ifeq ($(TOOLCHAIN_TYPE), gcc) |
587 # Turn off all warnings for sunFont.c. This is needed because the specific warning |
584 # Turn off all warnings for sunFont.c. This is needed because the specific warning |
588 # about discarding 'const' qualifier cannot be turned off individually. |
585 # about discarding 'const' qualifier cannot be turned off individually. |
589 BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w |
586 BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w |
590 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
|
591 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
|
592 endif |
587 endif |
593 |
588 |
594 # LDFLAGS clarification: |
589 # LDFLAGS clarification: |
595 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
590 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
596 # build-time decide to which library to link against (libawt_headless or |
591 # build-time decide to which library to link against (libawt_headless or |
605 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
600 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
606 CFLAGS_windows = -DCC_NOEX, \ |
601 CFLAGS_windows = -DCC_NOEX, \ |
607 EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \ |
602 EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \ |
608 WARNINGS_AS_ERRORS_xlc := false, \ |
603 WARNINGS_AS_ERRORS_xlc := false, \ |
609 DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ |
604 DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ |
610 type-limits missing-field-initializers implicit-fallthrough, \ |
605 type-limits missing-field-initializers implicit-fallthrough strict-aliasing, \ |
611 DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ |
606 DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \ |
612 maybe-uninitialized, \ |
607 maybe-uninitialized, \ |
613 DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ |
608 DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \ |
614 tautological-constant-out-of-range-compare int-to-pointer-cast, \ |
609 tautological-constant-out-of-range-compare int-to-pointer-cast, \ |
615 DISABLED_WARNINGS_C_solstudio = \ |
610 DISABLED_WARNINGS_C_solstudio = \ |
793 # libsplashscreen on macosx do not use the unix code |
788 # libsplashscreen on macosx do not use the unix code |
794 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix |
789 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix |
795 endif |
790 endif |
796 |
791 |
797 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
792 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
|
793 |
|
794 ifeq ($(OPENJDK_TARGET_OS), linux) |
|
795 ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) |
|
796 LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0 |
|
797 endif |
|
798 endif |
798 |
799 |
799 ifeq ($(OPENJDK_TARGET_OS), macosx) |
800 ifeq ($(OPENJDK_TARGET_OS), macosx) |
800 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
801 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
801 |
802 |
802 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
803 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |