equal
deleted
inserted
replaced
37 |
37 |
38 ################################################################################ |
38 ################################################################################ |
39 |
39 |
40 # We must not include java.desktop/unix/native/libmlib_image, which is only |
40 # We must not include java.desktop/unix/native/libmlib_image, which is only |
41 # for usage by solaris-sparc in libmlib_image_v. |
41 # for usage by solaris-sparc in libmlib_image_v. |
42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix |
42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := /unix/ |
43 |
43 |
44 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH |
44 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH |
45 |
45 |
46 ifeq ($(call isTargetCpuBits, 64), true) |
46 ifeq ($(call isTargetCpuBits, 64), true) |
47 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
47 BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT |
696 |
696 |
697 else # not windows |
697 else # not windows |
698 |
698 |
699 ifeq ($(call isTargetOs, macosx), true) |
699 ifeq ($(call isTargetOs, macosx), true) |
700 # libjawt on macosx do not use the unix code |
700 # libjawt on macosx do not use the unix code |
701 LIBJAWT_EXCLUDE_SRC_PATTERNS := unix |
701 LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/ |
702 endif |
702 endif |
703 |
703 |
704 ifeq ($(call isTargetOs, macosx), true) |
704 ifeq ($(call isTargetOs, macosx), true) |
705 JAWT_LIBS := -lawt_lwawt |
705 JAWT_LIBS := -lawt_lwawt |
706 else |
706 else |
786 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib |
786 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib |
787 endif |
787 endif |
788 |
788 |
789 ifeq ($(call isTargetOs, macosx), true) |
789 ifeq ($(call isTargetOs, macosx), true) |
790 # libsplashscreen on macosx do not use the unix code |
790 # libsplashscreen on macosx do not use the unix code |
791 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix |
791 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/ |
792 endif |
792 endif |
793 |
793 |
794 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
794 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
795 |
795 |
796 ifeq ($(call isTargetOs, linux), true) |
796 ifeq ($(call isTargetOs, linux), true) |