jdk/make/lib/Awt2dLibraries.gmk
changeset 40205 12384fff105a
parent 40196 0b3f554d2480
parent 40171 42ee62f634ea
child 41132 2a3c61e80af0
equal deleted inserted replaced
40204:2781da09d28f 40205:12384fff105a
    54     SRC := $(BUILD_LIBMLIB_SRC), \
    54     SRC := $(BUILD_LIBMLIB_SRC), \
    55     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    55     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    56     OPTIMIZATION := HIGHEST, \
    56     OPTIMIZATION := HIGHEST, \
    57     CFLAGS := $(CFLAGS_JDKLIB) \
    57     CFLAGS := $(CFLAGS_JDKLIB) \
    58         $(BUILD_LIBMLIB_CFLAGS), \
    58         $(BUILD_LIBMLIB_CFLAGS), \
    59     DISABLED_WARNINGS_gcc := parentheses array-bounds, \
       
    60     DISABLED_WARNINGS_clang := parentheses, \
       
    61     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
       
    62     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    59     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    63     LDFLAGS := $(LDFLAGS_JDKLIB) \
    60     LDFLAGS := $(LDFLAGS_JDKLIB) \
    64         $(call SET_SHARED_LIBRARY_ORIGIN), \
    61         $(call SET_SHARED_LIBRARY_ORIGIN), \
    65     LIBS := $(BUILD_LIBMLIB_LDLIBS) \
    62     LIBS := $(BUILD_LIBMLIB_LDLIBS) \
    66         $(JDKLIB_LIBS), \
    63         $(JDKLIB_LIBS), \
   117       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
   114       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
   118       OPTIMIZATION := HIGHEST, \
   115       OPTIMIZATION := HIGHEST, \
   119       CFLAGS := -xarch=sparcvis \
   116       CFLAGS := -xarch=sparcvis \
   120           $(LIBMLIB_IMAGE_V_CFLAGS) \
   117           $(LIBMLIB_IMAGE_V_CFLAGS) \
   121           $(CFLAGS_JDKLIB), \
   118           $(CFLAGS_JDKLIB), \
   122       DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
       
   123       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   119       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   124       LDFLAGS := $(LDFLAGS_JDKLIB) \
   120       LDFLAGS := $(LDFLAGS_JDKLIB) \
   125           $(call SET_SHARED_LIBRARY_ORIGIN), \
   121           $(call SET_SHARED_LIBRARY_ORIGIN), \
   126       LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \
   122       LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \
   127       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \
   123       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \
   145   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
   141   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
   146 endif
   142 endif
   147 
   143 
   148 ifeq ($(OPENJDK_TARGET_OS), windows)
   144 ifeq ($(OPENJDK_TARGET_OS), windows)
   149   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
   145   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
   150 else
       
   151   LIBAWT_EXFILES := java2d/ShaderList.c
       
   152 endif
   146 endif
   153 
   147 
   154 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   148 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   155   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
   149   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
   156 endif
   150 endif
   494     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   488     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   495     OPTIMIZATION := HIGHEST, \
   489     OPTIMIZATION := HIGHEST, \
   496     CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
   490     CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
   497         $(LIBJAVA_HEADER_FLAGS) \
   491         $(LIBJAVA_HEADER_FLAGS) \
   498         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
   492         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
   499     DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds shift-negative-value, \
   493     DISABLED_WARNINGS_gcc := clobbered, \
   500     DISABLED_WARNINGS_clang := logical-op-parentheses, \
       
   501     DISABLED_WARNINGS_microsoft := 4267, \
       
   502     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
   494     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
   503     LDFLAGS := $(LDFLAGS_JDKLIB) \
   495     LDFLAGS := $(LDFLAGS_JDKLIB) \
   504         $(call SET_SHARED_LIBRARY_ORIGIN), \
   496         $(call SET_SHARED_LIBRARY_ORIGIN), \
   505     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
   497     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
   506     LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
   498     LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \