jdk Sdiff make/lib

make/lib/Awt2dLibraries.gmk

rev 13657 : 8217676: Upgrade libpng to 1.6.37
Reviewed-by: prr, jdv, kcr

1132 ifndef BUILD_HEADLESS_ONLY
1133   LIBSPLASHSCREEN_DIRS := \
1134     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
1135     $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
1136     $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
1137 
1138   ifeq ($(USE_EXTERNAL_LIBGIF), true)
1139     GIFLIB_LDFLAGS := -lgif
1140   else
1141     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
1142     GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
1143   endif
1144 
1145   ifneq ($(OPENJDK_TARGET_OS), macosx)
1146     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
1147   else
1148     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
1149   endif
1150 
1151   LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \

1152       $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
1153 
1154   ifeq ($(OPENJDK_TARGET_OS), macosx)
1155     LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
1156         $(LIBSPLASHSCREEN_CFLAGS)
1157     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
1158     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
1159 
1160     LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
1161     LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
1162     LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
1163     LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
1164     LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
1165     LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
1166     LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
1167 
1168   else ifeq ($(OPENJDK_TARGET_OS), windows)
1169     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
1170   else
1171     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)

1132 ifndef BUILD_HEADLESS_ONLY
1133   LIBSPLASHSCREEN_DIRS := \
1134     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
1135     $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
1136     $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
1137 
1138   ifeq ($(USE_EXTERNAL_LIBGIF), true)
1139     GIFLIB_LDFLAGS := -lgif
1140   else
1141     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
1142     GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
1143   endif
1144 
1145   ifneq ($(OPENJDK_TARGET_OS), macosx)
1146     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
1147   else
1148     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
1149   endif
1150 
1151   LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
1152       -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0 \
1153       $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
1154 
1155   ifeq ($(OPENJDK_TARGET_OS), macosx)
1156     LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
1157         $(LIBSPLASHSCREEN_CFLAGS)
1158     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
1159     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
1160 
1161     LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
1162     LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
1163     LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
1164     LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
1165     LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
1166     LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
1167     LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
1168 
1169   else ifeq ($(OPENJDK_TARGET_OS), windows)
1170     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
1171   else
1172     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)

< prev index next >