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 |
376 NAME := lcms, \ |
376 NAME := lcms, \ |
377 INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
377 INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ |
378 OPTIMIZATION := HIGHEST, \ |
378 OPTIMIZATION := HIGHEST, \ |
379 CFLAGS := $(CFLAGS_JDKLIB) \ |
379 CFLAGS := $(CFLAGS_JDKLIB) \ |
380 $(LCMS_CFLAGS), \ |
380 $(LCMS_CFLAGS), \ |
381 CFLAGS_solaris := -xc99=no_lib, \ |
|
382 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
381 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
383 EXTRA_HEADER_DIRS := \ |
382 EXTRA_HEADER_DIRS := \ |
384 common/awt/debug \ |
383 common/awt/debug \ |
385 libawt/java2d, \ |
384 libawt/java2d, \ |
386 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
385 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
504 |
503 |
505 # For use by libfontmanager: |
504 # For use by libfontmanager: |
506 LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS) |
505 LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS) |
507 ifeq ($(call isTargetOs, windows), true) |
506 ifeq ($(call isTargetOs, windows), true) |
508 LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib |
507 LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib |
|
508 # freetype now requires you to manually define this (see ftconfig.h) |
|
509 BUILD_LIBFREETYPE_CFLAGS += -DDLL_EXPORT |
509 else |
510 else |
510 LIBFREETYPE_LIBS := -lfreetype |
511 LIBFREETYPE_LIBS := -lfreetype |
511 endif |
512 endif |
512 |
513 |
513 $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \ |
514 $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \ |
517 $(BUILD_LIBFREETYPE_CFLAGS), \ |
518 $(BUILD_LIBFREETYPE_CFLAGS), \ |
518 EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \ |
519 EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \ |
519 DISABLED_WARNINGS_solstudio := \ |
520 DISABLED_WARNINGS_solstudio := \ |
520 E_STATEMENT_NOT_REACHED \ |
521 E_STATEMENT_NOT_REACHED \ |
521 E_END_OF_LOOP_CODE_NOT_REACHED, \ |
522 E_END_OF_LOOP_CODE_NOT_REACHED, \ |
522 DISABLED_WARNINGS_microsoft := 4267 4244 4312 4819, \ |
523 DISABLED_WARNINGS_microsoft := 4018 4267 4244 4312 4819, \ |
523 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
524 DISABLED_WARNINGS_gcc := implicit-fallthrough cast-function-type bad-function-cast, \ |
524 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
525 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
525 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
526 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
526 )) |
527 )) |
527 |
528 |
528 TARGETS += $(BUILD_LIBFREETYPE) |
529 TARGETS += $(BUILD_LIBFREETYPE) |
695 |
696 |
696 else # not windows |
697 else # not windows |
697 |
698 |
698 ifeq ($(call isTargetOs, macosx), true) |
699 ifeq ($(call isTargetOs, macosx), true) |
699 # libjawt on macosx do not use the unix code |
700 # libjawt on macosx do not use the unix code |
700 LIBJAWT_EXCLUDE_SRC_PATTERNS := unix |
701 LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/ |
701 endif |
702 endif |
702 |
703 |
703 ifeq ($(call isTargetOs, macosx), true) |
704 ifeq ($(call isTargetOs, macosx), true) |
704 JAWT_LIBS := -lawt_lwawt |
705 JAWT_LIBS := -lawt_lwawt |
705 else |
706 else |
785 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib |
786 LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib |
786 endif |
787 endif |
787 |
788 |
788 ifeq ($(call isTargetOs, macosx), true) |
789 ifeq ($(call isTargetOs, macosx), true) |
789 # libsplashscreen on macosx do not use the unix code |
790 # libsplashscreen on macosx do not use the unix code |
790 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix |
791 LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/ |
791 endif |
792 endif |
792 |
793 |
793 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 |
794 |
795 |
795 ifeq ($(call isTargetOs, linux), true) |
796 ifeq ($(call isTargetOs, linux), true) |
820 ifeq ($(call isTargetOs, macosx), true) |
821 ifeq ($(call isTargetOs, macosx), true) |
821 LIBSPLASHSCREEN_LIBS += \ |
822 LIBSPLASHSCREEN_LIBS += \ |
822 $(LIBM) -lpthread -liconv -losxapp \ |
823 $(LIBM) -lpthread -liconv -losxapp \ |
823 -framework ApplicationServices \ |
824 -framework ApplicationServices \ |
824 -framework Foundation \ |
825 -framework Foundation \ |
|
826 -framework Security \ |
825 -framework Cocoa \ |
827 -framework Cocoa \ |
826 -framework JavaNativeFoundation |
828 -framework JavaNativeFoundation |
827 else ifeq ($(call isTargetOs, windows), true) |
829 else ifeq ($(call isTargetOs, windows), true) |
828 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
830 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
829 else |
831 else |