make/lib/Awt2dLibraries.gmk
branchihse-jdk-library-branch
changeset 56524 a28c4627d44c
parent 56522 76b0a9b8f417
child 56525 8f4013a45080
equal deleted inserted replaced
56523:f4048e6f33ba 56524:a28c4627d44c
    72   # libmlib_image_v is basically built from mlib_image sources, with some additions
    72   # libmlib_image_v is basically built from mlib_image sources, with some additions
    73   # and some exclusions.
    73   # and some exclusions.
    74   LIBMLIB_IMAGE_V_SRC := \
    74   LIBMLIB_IMAGE_V_SRC := \
    75      libmlib_image \
    75      libmlib_image \
    76      common/awt/medialib \
    76      common/awt/medialib \
    77     #
    77      #
    78 
    78 
    79   LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    79   LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    80       $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
    80       $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
    81 
    81 
    82   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
    82   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
    83     LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
    83     LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
    84   endif
    84   endif
    85 
       
    86 
    85 
    87   BUILD_LIBMLIB_IMAGE_V_EXFILES := \
    86   BUILD_LIBMLIB_IMAGE_V_EXFILES := \
    88       awt_ImagingLib.c \
    87       awt_ImagingLib.c \
    89       mlib_c_ImageAffine_BC.c \
    88       mlib_c_ImageAffine_BC.c \
    90       mlib_c_ImageAffine_BC_S16.c \
    89       mlib_c_ImageAffine_BC_S16.c \
   163       $(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
   162       $(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
   164       $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
   163       $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
   165       #
   164       #
   166 endif
   165 endif
   167 
   166 
   168 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
       
   169 
       
   170 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
       
   171   LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
       
   172       $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
       
   173 
       
   174   LIBAWT_ASFLAGS = -P -xarch=v9a
       
   175 endif
       
   176 
       
   177 ifneq ($(OPENJDK_TARGET_OS), solaris)
       
   178   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
       
   179 endif
       
   180 
       
   181 ifeq ($(OPENJDK_TARGET_OS), windows)
       
   182   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
       
   183   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
       
   184     LIBAWT_CFLAGS += -DMLIB_OS64BIT
       
   185   endif
       
   186 
       
   187   LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
       
   188   LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
       
   189 endif
       
   190 
       
   191 ifeq ($(OPENJDK_TARGET_OS), linux)
       
   192   # FIXME: This is probably not what we want to do, but keep it now for compatibility.
       
   193   LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
       
   194 endif
       
   195 
       
   196 # Turn off all warnings for debug_mem.c This is needed because the specific warning
       
   197 # about initializing a declared 'extern' cannot be turned off individually. Only
       
   198 # applies to debug builds.
       
   199 ifeq ($(TOOLCHAIN_TYPE), gcc)
       
   200   BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
       
   201   # This option improves performance of MaskFill in Java2D by 20% for some gcc
       
   202   LIBAWT_CFLAGS += -fgcse-after-reload
       
   203 endif
       
   204 
       
   205 LIBAWT_EXTRA_HEADER_DIRS := \
   167 LIBAWT_EXTRA_HEADER_DIRS := \
   206     $(LIBAWT_DEFAULT_HEADER_DIRS) \
   168     $(LIBAWT_DEFAULT_HEADER_DIRS) \
   207     $(call GetJavaHeaderDir, java.base) \
   169     $(call GetJavaHeaderDir, java.base) \
   208     libawt/awt/medialib \
   170     libawt/awt/medialib \
   209     libawt/java2d/d3d \
   171     libawt/java2d/d3d \
   214     libmlib_image \
   176     libmlib_image \
   215     include \
   177     include \
   216     java.base:libjava \
   178     java.base:libjava \
   217     java.base:include \
   179     java.base:include \
   218     #
   180     #
       
   181 
       
   182 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
       
   183 
       
   184 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
       
   185   LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
       
   186       $(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
       
   187 
       
   188   LIBAWT_ASFLAGS = -P -xarch=v9a
       
   189 endif
       
   190 
       
   191 ifneq ($(OPENJDK_TARGET_OS), solaris)
       
   192   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
       
   193 endif
       
   194 
       
   195 ifeq ($(OPENJDK_TARGET_OS), windows)
       
   196   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
       
   197   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
       
   198     LIBAWT_CFLAGS += -DMLIB_OS64BIT
       
   199   endif
       
   200 
       
   201   LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
       
   202   LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
       
   203 endif
       
   204 
       
   205 ifeq ($(OPENJDK_TARGET_OS), linux)
       
   206   # FIXME: This is probably not what we want to do, but keep it now for compatibility.
       
   207   LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
       
   208 endif
       
   209 
       
   210 # Turn off all warnings for debug_mem.c This is needed because the specific warning
       
   211 # about initializing a declared 'extern' cannot be turned off individually. Only
       
   212 # applies to debug builds.
       
   213 ifeq ($(TOOLCHAIN_TYPE), gcc)
       
   214   BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
       
   215   # This option improves performance of MaskFill in Java2D by 20% for some gcc
       
   216   LIBAWT_CFLAGS += -fgcse-after-reload
       
   217 endif
   219 
   218 
   220 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
   219 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
   221     NAME := awt, \
   220     NAME := awt, \
   222     EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
   221     EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
   223     EXCLUDES := $(LIBAWT_EXCLUDES), \
   222     EXCLUDES := $(LIBAWT_EXCLUDES), \