make/lib/Awt2dLibraries.gmk
changeset 51853 ec62d6cab037
parent 51819 f12165de3cc0
child 52022 804792ce736f
equal deleted inserted replaced
51852:e240625311ad 51853:ec62d6cab037
    53     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    53     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    54     EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
    54     EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
    55     OPTIMIZATION := HIGHEST, \
    55     OPTIMIZATION := HIGHEST, \
    56     CFLAGS := $(CFLAGS_JDKLIB) \
    56     CFLAGS := $(CFLAGS_JDKLIB) \
    57         $(BUILD_LIBMLIB_CFLAGS), \
    57         $(BUILD_LIBMLIB_CFLAGS), \
       
    58     DISABLED_WARNINGS_gcc := unused-function, \
    58     LDFLAGS := $(LDFLAGS_JDKLIB) \
    59     LDFLAGS := $(LDFLAGS_JDKLIB) \
    59         $(call SET_SHARED_LIBRARY_ORIGIN), \
    60         $(call SET_SHARED_LIBRARY_ORIGIN), \
    60     LIBS := $(JDKLIB_LIBS), \
    61     LIBS := $(JDKLIB_LIBS), \
    61     LIBS_unix := $(LIBM) $(LIBDL), \
    62     LIBS_unix := $(LIBM) $(LIBDL), \
    62 ))
    63 ))
   223     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
   224     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
   224     OPTIMIZATION := LOW, \
   225     OPTIMIZATION := LOW, \
   225     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   226     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   226     EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
   227     EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
   227     DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
   228     DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
   228         format-nonliteral parentheses, \
   229         format-nonliteral parentheses unused-value unused-function, \
   229     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
   230     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \
       
   231         sign-compare format-nonliteral, \
   230     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
   232     DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
   231     DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
   233     DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
   232     ASFLAGS := $(LIBAWT_ASFLAGS), \
   234     ASFLAGS := $(LIBAWT_ASFLAGS), \
   233     LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
   235     LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
   234     LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
   236     LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
   332             $(X_CFLAGS), \
   334             $(X_CFLAGS), \
   333         WARNINGS_AS_ERRORS_xlc := false, \
   335         WARNINGS_AS_ERRORS_xlc := false, \
   334         DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
   336         DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
   335             unused-result maybe-uninitialized format \
   337             unused-result maybe-uninitialized format \
   336             format-security int-to-pointer-cast parentheses \
   338             format-security int-to-pointer-cast parentheses \
   337             implicit-fallthrough, \
   339             implicit-fallthrough undef unused-function, \
       
   340         DISABLED_WARNINGS_clang := parentheses format undef \
       
   341             logical-op-parentheses format-nonliteral int-conversion, \
   338         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
   342         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
   339             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
   343             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
   340         LDFLAGS := $(LDFLAGS_JDKLIB) \
   344         LDFLAGS := $(LDFLAGS_JDKLIB) \
   341             $(call SET_SHARED_LIBRARY_ORIGIN) \
   345             $(call SET_SHARED_LIBRARY_ORIGIN) \
   342             -L$(INSTALL_LIBRARIES_HERE), \
   346             -L$(INSTALL_LIBRARIES_HERE), \
   378     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   382     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   379     EXTRA_HEADER_DIRS := \
   383     EXTRA_HEADER_DIRS := \
   380         common/awt/debug \
   384         common/awt/debug \
   381         libawt/java2d, \
   385         libawt/java2d, \
   382     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
   386     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
   383     DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
   387     DISABLED_WARNINGS_gcc := format-nonliteral type-limits \
   384     DISABLED_WARNINGS_clang := tautological-compare, \
   388         misleading-indentation undef unused-function, \
       
   389     DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \
   385     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   390     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   386     DISABLED_WARNINGS_microsoft := 4819, \
   391     DISABLED_WARNINGS_microsoft := 4819, \
   387     LDFLAGS := $(LDFLAGS_JDKLIB) \
   392     LDFLAGS := $(LDFLAGS_JDKLIB) \
   388         $(call SET_SHARED_LIBRARY_ORIGIN), \
   393         $(call SET_SHARED_LIBRARY_ORIGIN), \
   389     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   394     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   464       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
   469       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
   465       OPTIMIZATION := LOW, \
   470       OPTIMIZATION := LOW, \
   466       CFLAGS := $(CFLAGS_JDKLIB) \
   471       CFLAGS := $(CFLAGS_JDKLIB) \
   467           $(LIBAWT_HEADLESS_CFLAGS), \
   472           $(LIBAWT_HEADLESS_CFLAGS), \
   468       EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
   473       EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
       
   474       DISABLED_WARNINGS_gcc := unused-function, \
   469       DISABLED_WARNINGS_xlc := 1506-356, \
   475       DISABLED_WARNINGS_xlc := 1506-356, \
   470       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
   476       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
   471       LDFLAGS := $(LDFLAGS_JDKLIB) \
   477       LDFLAGS := $(LDFLAGS_JDKLIB) \
   472           $(call SET_SHARED_LIBRARY_ORIGIN), \
   478           $(call SET_SHARED_LIBRARY_ORIGIN), \
   473       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   479       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   602     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
   608     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
   603     CFLAGS_windows = -DCC_NOEX, \
   609     CFLAGS_windows = -DCC_NOEX, \
   604     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
   610     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
   605     WARNINGS_AS_ERRORS_xlc := false, \
   611     WARNINGS_AS_ERRORS_xlc := false, \
   606     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
   612     DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
   607         type-limits missing-field-initializers implicit-fallthrough strict-aliasing, \
   613         type-limits missing-field-initializers implicit-fallthrough \
       
   614         strict-aliasing undef unused-function, \
   608     DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
   615     DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
   609         maybe-uninitialized, \
   616         maybe-uninitialized, \
   610     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
   617     DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
   611         tautological-constant-out-of-range-compare int-to-pointer-cast, \
   618         tautological-constant-out-of-range-compare int-to-pointer-cast \
       
   619         sign-compare undef missing-field-initializers, \
   612     DISABLED_WARNINGS_C_solstudio = \
   620     DISABLED_WARNINGS_C_solstudio = \
   613         E_INTEGER_OVERFLOW_DETECTED \
   621         E_INTEGER_OVERFLOW_DETECTED \
   614         E_ARG_INCOMPATIBLE_WITH_ARG_L \
   622         E_ARG_INCOMPATIBLE_WITH_ARG_L \
   615         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
   623         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
   616     DISABLED_WARNINGS_CXX_solstudio := \
   624     DISABLED_WARNINGS_CXX_solstudio := \
   713       EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
   721       EXCLUDE_SRC_PATTERNS := $(LIBJAWT_EXCLUDE_SRC_PATTERNS), \
   714       INCLUDE_FILES := $(JAWT_FILES), \
   722       INCLUDE_FILES := $(JAWT_FILES), \
   715       OPTIMIZATION := LOW, \
   723       OPTIMIZATION := LOW, \
   716       CFLAGS := $(CFLAGS_JDKLIB) \
   724       CFLAGS := $(CFLAGS_JDKLIB) \
   717           $(JAWT_CFLAGS), \
   725           $(JAWT_CFLAGS), \
       
   726       DISABLED_WARNINGS_clang := sign-compare, \
   718       EXTRA_HEADER_DIRS := \
   727       EXTRA_HEADER_DIRS := \
   719           include \
   728           include \
   720           common/awt, \
   729           common/awt, \
   721       LDFLAGS := $(LDFLAGS_JDKLIB) \
   730       LDFLAGS := $(LDFLAGS_JDKLIB) \
   722           $(call SET_SHARED_LIBRARY_ORIGIN), \
   731           $(call SET_SHARED_LIBRARY_ORIGIN), \
   846       OPTIMIZATION := LOW, \
   855       OPTIMIZATION := LOW, \
   847       CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
   856       CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
   848           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
   857           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
   849       EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
   858       EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
   850       DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
   859       DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
   851           maybe-uninitialized shift-negative-value implicit-fallthrough, \
   860           maybe-uninitialized shift-negative-value implicit-fallthrough \
   852       DISABLED_WARNINGS_clang := incompatible-pointer-types, \
   861           unused-function, \
       
   862       DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare, \
   853       DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
   863       DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
   854           E_STATEMENT_NOT_REACHED, \
   864           E_STATEMENT_NOT_REACHED, \
   855       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
   865       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
   856       LDFLAGS := $(LDFLAGS_JDKLIB) \
   866       LDFLAGS := $(LDFLAGS_JDKLIB) \
   857           $(call SET_SHARED_LIBRARY_ORIGIN), \
   867           $(call SET_SHARED_LIBRARY_ORIGIN), \
   906       CFLAGS := $(CFLAGS_JDKLIB) \
   916       CFLAGS := $(CFLAGS_JDKLIB) \
   907           $(LIBAWT_LWAWT_CFLAGS), \
   917           $(LIBAWT_LWAWT_CFLAGS), \
   908       EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
   918       EXTRA_HEADER_DIRS := $(LIBAWT_LWAWT_EXTRA_HEADER_DIRS), \
   909       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
   919       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
   910           deprecated-declarations objc-method-access bitwise-op-parentheses \
   920           deprecated-declarations objc-method-access bitwise-op-parentheses \
   911           incompatible-pointer-types parentheses-equality extra-tokens, \
   921           incompatible-pointer-types parentheses-equality extra-tokens \
       
   922           sign-compare semicolon-before-method-body format-nonliteral undef \
       
   923           pointer-arith, \
   912       LDFLAGS := $(LDFLAGS_JDKLIB) \
   924       LDFLAGS := $(LDFLAGS_JDKLIB) \
   913           $(call SET_SHARED_LIBRARY_ORIGIN) \
   925           $(call SET_SHARED_LIBRARY_ORIGIN) \
   914           -L$(INSTALL_LIBRARIES_HERE), \
   926           -L$(INSTALL_LIBRARIES_HERE), \
   915       LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
   927       LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
   916           -framework Accelerate \
   928           -framework Accelerate \
   947       OPTIMIZATION := LOW, \
   959       OPTIMIZATION := LOW, \
   948       CFLAGS := $(CFLAGS_JDKLIB), \
   960       CFLAGS := $(CFLAGS_JDKLIB), \
   949       EXTRA_HEADER_DIRS := \
   961       EXTRA_HEADER_DIRS := \
   950           libawt_lwawt/awt \
   962           libawt_lwawt/awt \
   951           libosxapp, \
   963           libosxapp, \
   952       DISABLED_WARNINGS_clang := deprecated-declarations, \
   964       DISABLED_WARNINGS_clang := deprecated-declarations sign-compare, \
   953       LDFLAGS := $(LDFLAGS_JDKLIB) \
   965       LDFLAGS := $(LDFLAGS_JDKLIB) \
   954           $(call SET_SHARED_LIBRARY_ORIGIN) \
   966           $(call SET_SHARED_LIBRARY_ORIGIN) \
   955           -Wl$(COMMA)-rpath$(COMMA)@loader_path \
   967           -Wl$(COMMA)-rpath$(COMMA)@loader_path \
   956           -L$(INSTALL_LIBRARIES_HERE), \
   968           -L$(INSTALL_LIBRARIES_HERE), \
   957       LIBS := -lawt -losxapp -lawt_lwawt \
   969       LIBS := -lawt -losxapp -lawt_lwawt \