jdk/make/lib/Awt2dLibraries.gmk
changeset 24540 41aa84a568f3
parent 23592 35b16ae6b4f4
child 24547 1b3cb0c1ac87
equal deleted inserted replaced
24539:f0250a79028b 24540:41aa84a568f3
   655   endif
   655   endif
   656 endif
   656 endif
   657 
   657 
   658 ##########################################################################################
   658 ##########################################################################################
   659 
   659 
       
   660 LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
       
   661 
       
   662 ifeq ($(USE_EXTERNAL_LCMS), true)
       
   663   # If we're using an external library, we'll just need the wrapper part.
       
   664   # By including it explicitely, all other files will be excluded.
       
   665   BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
       
   666   BUILD_LIBLCMS_HEADERS :=
       
   667 else
       
   668   BUILD_LIBLCMS_INCLUDE_FILES :=
       
   669   # If we're using the bundled library, we'll need to include it in the
       
   670   # include path explicitly. Otherwise the system headers will be used.
       
   671   BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
       
   672 endif
       
   673 
   660 # TODO: Update awt lib path when awt is converted
   674 # TODO: Update awt lib path when awt is converted
   661 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
   675 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
   662     LIBRARY := lcms, \
   676     LIBRARY := lcms, \
   663     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   677     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   664     SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
   678     SRC := $(LIBLCMS_DIR), \
       
   679     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
   665     LANG := C, \
   680     LANG := C, \
   666     OPTIMIZATION := HIGHEST, \
   681     OPTIMIZATION := HIGHEST, \
   667     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   682     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   668         $(SHARED_LIBRARY_FLAGS) \
   683         $(SHARED_LIBRARY_FLAGS) \
   669         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
   684         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
   670         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
   685         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   686         $(BUILD_LIBLCMS_HEADERS) \
       
   687         $(LCMS_CFLAGS), \
   671     CFLAGS_solaris := -xc99=no_lib, \
   688     CFLAGS_solaris := -xc99=no_lib, \
   672     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   689     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   673     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
   690     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
   674     LDFLAGS := $(LDFLAGS_JDKLIB) \
   691     LDFLAGS := $(LDFLAGS_JDKLIB) \
   675         $(call SET_SHARED_LIBRARY_ORIGIN), \
   692         $(call SET_SHARED_LIBRARY_ORIGIN), \
   676     LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
   693     LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
   677     LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   694     LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   678     LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
   695     LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
   679     LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
   696     LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
   680     LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
   697     LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
   681     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
   698     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
   682     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   699     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   683     RC_FLAGS := $(RC_FLAGS) \
   700     RC_FLAGS := $(RC_FLAGS) \
   684         -D "JDK_FNAME=lcms.dll" \
   701         -D "JDK_FNAME=lcms.dll" \
   685         -D "JDK_INTERNAL_NAME=lcms" \
   702         -D "JDK_INTERNAL_NAME=lcms" \
   686         -D "JDK_FTYPE=0x2L", \
   703         -D "JDK_FTYPE=0x2L", \