707 |
707 |
708 $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
708 $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
709 |
709 |
710 ########################################################################################## |
710 ########################################################################################## |
711 |
711 |
|
712 BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg |
|
713 |
712 ifdef OPENJDK |
714 ifdef OPENJDK |
713 BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers |
715 BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers |
714 else |
716 else |
715 BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed |
717 BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed |
716 BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg |
718 BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg |
717 BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC) |
719 BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC) |
718 endif |
720 endif |
719 |
721 |
720 BUILD_LIBJPEG_REORDER := |
722 BUILD_LIBJAVAJPEG_REORDER := |
721 ifeq ($(OPENJDK_TARGET_OS), solaris) |
723 ifeq ($(OPENJDK_TARGET_OS), solaris) |
722 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
724 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
723 BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) |
725 BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) |
724 endif |
726 endif |
725 endif |
727 endif |
|
728 |
726 |
729 |
727 # Suppress gcc warnings like "variable might be clobbered by 'longjmp' |
730 # Suppress gcc warnings like "variable might be clobbered by 'longjmp' |
728 # or 'vfork'": this warning indicates that some variable is placed to |
731 # or 'vfork'": this warning indicates that some variable is placed to |
729 # a register by optimized compiler and it's value might be lost on longjmp(). |
732 # a register by optimized compiler and it's value might be lost on longjmp(). |
730 # Recommended way to avoid such warning is to declare the variable as |
733 # Recommended way to avoid such warning is to declare the variable as |
733 #ifndef CROSS_COMPILE_ARCH |
736 #ifndef CROSS_COMPILE_ARCH |
734 # CC_43_OR_NEWER := \ |
737 # CC_43_OR_NEWER := \ |
735 # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ |
738 # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ |
736 # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) |
739 # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) |
737 # ifeq ($(CC_43_OR_NEWER), 1) |
740 # ifeq ($(CC_43_OR_NEWER), 1) |
738 # BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered |
741 # BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered |
739 # endif |
742 # endif |
740 #endif |
743 #endif |
741 |
744 |
742 $(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \ |
745 ifeq ($(USE_EXTERNAL_LIBJPEG), true) |
743 LIBRARY := jpeg, \ |
746 LIBJPEG_LIBS := -ljpeg |
|
747 BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ |
|
748 imageIOJPEG.c \ |
|
749 jpegdecoder.c |
|
750 BUILD_LIBJAVAJPEG_HEADERS := |
|
751 else |
|
752 LIBJPEG_LIBS := |
|
753 BUILD_LIBJAVAJPEG_INCLUDE_FILES := |
|
754 BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR) |
|
755 endif |
|
756 |
|
757 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ |
|
758 LIBRARY := javajpeg, \ |
744 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
759 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
745 SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \ |
760 SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \ |
746 $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \ |
761 $(BUILD_LIBJAVAJPEG_DIR), \ |
|
762 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
747 LANG := C, \ |
763 LANG := C, \ |
748 OPTIMIZATION := HIGHEST, \ |
764 OPTIMIZATION := HIGHEST, \ |
749 CFLAGS := $(CFLAGS_JDKLIB) \ |
765 CFLAGS := $(CFLAGS_JDKLIB) \ |
750 $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ |
766 $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ |
751 -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \ |
767 $(BUILD_LIBJAVAJPEG_HEADERS), \ |
752 MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \ |
768 MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ |
753 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
769 LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \ |
754 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
770 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
755 LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
771 LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
756 LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ |
772 LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \ |
757 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
773 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
758 RC_FLAGS := $(RC_FLAGS) \ |
774 RC_FLAGS := $(RC_FLAGS) \ |
759 -D "JDK_FNAME=jpeg.dll" \ |
775 -D "JDK_FNAME=javajpeg.dll" \ |
760 -D "JDK_INTERNAL_NAME=jpeg" \ |
776 -D "JDK_INTERNAL_NAME=javajpeg" \ |
761 -D "JDK_FTYPE=0x2L", \ |
777 -D "JDK_FTYPE=0x2L", \ |
762 REORDER := $(BUILD_LIBJPEG_REORDER), \ |
778 REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \ |
763 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \ |
779 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \ |
764 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
780 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
765 |
781 |
766 $(BUILD_LIBJPEG): $(BUILD_LIBJAVA) |
782 $(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA) |
767 |
783 |
768 BUILD_LIBRARIES += $(BUILD_LIBJPEG) |
784 BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG) |
769 |
785 |
770 ########################################################################################## |
786 ########################################################################################## |
771 |
787 |
772 ifndef OPENJDK |
788 ifndef OPENJDK |
773 FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k |
789 FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k |
1274 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
1297 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
1275 EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
1298 EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ |
1276 LANG := C, \ |
1299 LANG := C, \ |
1277 OPTIMIZATION := LOW, \ |
1300 OPTIMIZATION := LOW, \ |
1278 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
1301 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
1279 $(GIFLIB_CFLAGS) $(PNG_CFLAGS), \ |
1302 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \ |
1280 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ |
1303 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \ |
1281 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1304 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1282 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1305 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
1283 LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ |
1306 LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \ |
1284 $(GIFLIB_LDFLAGS) $(PNG_LIBS), \ |
1307 $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \ |
1285 LDFLAGS_SUFFIX_solaris := -lc, \ |
1308 LDFLAGS_SUFFIX_solaris := -lc, \ |
1286 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
1309 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
1287 RC_FLAGS := $(RC_FLAGS) \ |
1310 RC_FLAGS := $(RC_FLAGS) \ |
1288 -D "JDK_FNAME=splashscreen.dll" \ |
1311 -D "JDK_FNAME=splashscreen.dll" \ |
1289 -D "JDK_INTERNAL_NAME=splashscreen" \ |
1312 -D "JDK_INTERNAL_NAME=splashscreen" \ |