make/lib/Awt2dLibraries.gmk
author kvn
Wed, 28 Mar 2018 17:20:06 -0700
changeset 49640 dd76fcbda95f
parent 49263 78af880eec61
child 49679 7084eec5c723
permissions -rw-r--r--
8200383: Can't build on SPARC Hotspot with code which use math functions Summary: remove old hack which supports Solaris 8 and 9 Reviewed-by: erikj, ihse
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
     2
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
    26
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
39504
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 39025
diff changeset
    27
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    28
WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
    30
################################################################################
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    32
BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    33
    $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    34
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    35
    $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    36
    -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    37
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    38
BUILD_LIBMLIB_LDLIBS :=
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    39
BUILD_LIBMLIB_IMAGE_MAPFILE := $(TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    40
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    41
BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    42
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    43
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    44
  BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    45
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    46
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    47
ifneq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    48
  BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    49
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    50
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
    51
$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
    52
    NAME := mlib_image, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    53
    SRC := $(BUILD_LIBMLIB_SRC), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    54
    EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    55
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    56
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    57
        $(BUILD_LIBMLIB_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    58
    MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    59
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    60
        $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
    61
    LIBS := $(BUILD_LIBMLIB_LDLIBS) \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
    62
        $(JDKLIB_LIBS), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
    63
))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    64
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    65
$(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    66
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
    67
TARGETS += $(BUILD_LIBMLIB_IMAGE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    68
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
    69
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    70
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    71
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    72
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    73
  LIBMLIB_IMAGE_V_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    74
      $(TOPDIR)/src/java.desktop/unix/native/libmlib_image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    75
      $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    76
      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    77
      #
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    78
  LIBMLIB_IMAGE_V_CFLAGS := $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    79
      $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    80
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    81
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    82
  BUILD_LIBMLIB_IMAGE_V_EXFILES := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    83
      awt_ImagingLib.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    84
      mlib_c_ImageAffine_BC.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    85
      mlib_c_ImageAffine_BC_S16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    86
      mlib_c_ImageAffine_BC_U16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    87
      mlib_c_ImageAffine_BL.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    88
      mlib_c_ImageAffine_BL_S16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    89
      mlib_c_ImageAffine_BL_U16.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    90
      mlib_c_ImageAffine_NN.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    91
      mlib_c_ImageConvClearEdge.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    92
      mlib_c_ImageConvCopyEdge.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    93
      mlib_c_ImageConv_f.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    94
      mlib_c_ImageConvVersion.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    95
      mlib_c_ImageCopy.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    96
      mlib_c_ImageLookUp.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    97
      mlib_c_ImageLookUp_f.c \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    98
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
    99
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   100
  LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   102
  $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   103
      NAME := mlib_image_v, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   104
      SRC := $(LIBMLIB_IMAGE_V_SRC), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   105
      EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
      OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   107
      CFLAGS := -xarch=sparcvis \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   108
          $(LIBMLIB_IMAGE_V_CFLAGS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   109
          $(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   110
      MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   111
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   112
          $(call SET_SHARED_LIBRARY_ORIGIN), \
49241
de4b3a04feae 8199606: Set -lc as global LIBS on solstudio
ihse
parents: 49239
diff changeset
   113
      LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   114
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   115
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   116
  $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   117
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   118
  TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   119
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   120
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   121
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   122
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   123
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   124
LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   125
    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   126
    $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   127
    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   128
    #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   129
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   130
ifeq ($(OPENJDK_TARGET_OS), aix)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   131
  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   132
endif
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   133
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   134
ifeq ($(OPENJDK_TARGET_OS), windows)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   135
  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   136
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   137
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   138
ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   139
  LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   140
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   141
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   142
ifeq ($(OPENJDK_TARGET_OS), macosx)
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   143
  LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
22597
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   144
endif
7515a991bb37 8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents: 22595
diff changeset
   145
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   146
LIBAWT_CFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   147
    $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   148
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   149
    $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   150
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   151
26225
3c7e92c78bab 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 26191
diff changeset
   152
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   154
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   155
  LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
  LIBAWT_CFLAGS += -xarch=sparcvis
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   158
  LIBAWT_CFLAGS += $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   159
  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   160
  LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
  ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   163
    LIBAWT_ASFLAGS = -P -xarch=v9a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   164
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
    LIBAWT_ASFLAGS = -P -xarch=v8plusa
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   167
else
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   168
  LIBAWT_EXCLUDES += \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   169
      $(TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   170
      $(TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   171
      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   172
      #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   173
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   174
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
ifneq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
  LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   177
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   178
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   179
ifeq ($(OPENJDK_TARGET_OS), windows)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   180
  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   181
      $(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   182
      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   183
  # Why does libawt need java.base headers?
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   184
  LIBAWT_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   185
      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   186
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   187
      -I$(TOPDIR)/src/java.desktop/windows/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   188
      -I$(TOPDIR)/src/java.desktop/share/native/include \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   189
      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   190
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   191
  LIBAWT_EXFILES += \
26751
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   192
      java2d/d3d/D3DShaderGen.c \
70bac69b37c9 8056216: Remove "sun" directory layer from libawt and common
prr
parents: 26741
diff changeset
   193
      awt/image/cvutils/img_colors.c \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   194
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   196
  LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   197
  ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   198
    LIBAWT_CFLAGS += -DMLIB_OS64BIT
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   201
  LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   202
  LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   203
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   204
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   205
LIBAWT_MAPFILE := $(TOPDIR)/make/mapfiles/libawt/mapfile-vers
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   206
ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   207
  LIBAWT_MAPFILE :=
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   208
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   209
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   210
# Turn off all warnings for debug_mem.c This is needed because the specific warning
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   211
# about initializing a declared 'extern' cannot be turned off individually. Only
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   212
# applies to debug builds.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   213
ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   214
  BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
43082
cf17b8a17dc0 8140266: Performance loss between jdk8 and jdk9 on Maskfill
serb
parents: 42747
diff changeset
   215
  # This option improves performance of MaskFill in Java2D by 20% for some gcc
cf17b8a17dc0 8140266: Performance loss between jdk8 and jdk9 on Maskfill
serb
parents: 42747
diff changeset
   216
  LIBAWT_CFLAGS += -fgcse-after-reload
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   217
endif
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   218
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   219
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   220
    NAME := awt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
    SRC := $(LIBAWT_DIRS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   222
    EXCLUDES := $(LIBAWT_EXCLUDES), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   223
    EXCLUDE_FILES := $(LIBAWT_EXFILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   226
    DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   227
        format-nonliteral parentheses, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   228
    DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   229
    DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   230
    DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   231
    ASFLAGS := $(LIBAWT_ASFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   232
    MAPFILE := $(LIBAWT_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   233
    LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   234
    LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   235
    LDFLAGS_windows := -delayload:user32.dll -delayload:gdi32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   236
        -delayload:shell32.dll -delayload:winmm.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   237
        -delayload:winspool.drv -delayload:imm32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   238
        -delayload:ole32.dll -delayload:comdlg32.dll \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   239
        -delayload:comctl32.dll -delayload:shlwapi.dll, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   240
    LIBS_unix := -ljvm -ljava $(LIBM), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   241
    LIBS_linux :=  $(LIBDL), \
49241
de4b3a04feae 8199606: Set -lc as global LIBS on solstudio
ihse
parents: 49239
diff changeset
   242
    LIBS_solaris := $(LIBDL), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   243
    LIBS_aix := $(LIBDL),\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   244
    LIBS_macosx := -lmlib_image \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   246
        -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   247
        -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   248
        -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   249
        -framework ApplicationServices \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   250
        -framework AudioToolbox, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   251
    LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   252
        imm32.lib ole32.lib uuid.lib shell32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
        comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   254
        delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   255
    VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
    RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   257
        -D "JDK_FNAME=awt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   258
        -D "JDK_INTERNAL_NAME=awt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
        -D "JDK_FTYPE=0x2L", \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   260
))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   261
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   262
$(BUILD_LIBAWT): $(call FindLib, java.base, java)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   263
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   264
ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   265
  $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   266
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   267
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   268
TARGETS += $(BUILD_LIBAWT)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   269
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   270
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   271
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   272
ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   273
  ifeq ($(ENABLE_HEADLESS_ONLY), false)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   275
    LIBAWT_XAWT_DIRS := \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   276
        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   277
        $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   278
        $(TOPDIR)/src/java.desktop/share/native/common/awt/utility \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   279
        $(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   280
        $(TOPDIR)/src/java.desktop/share/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   281
        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   282
        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   283
        #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   284
36953
d707077d2f74 8153727: AIX jdk build broken after 8145174
stuefe
parents: 36907
diff changeset
   285
    ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   286
      LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
36880
3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174
erikj
parents: 36869
diff changeset
   287
    endif
3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174
erikj
parents: 36869
diff changeset
   288
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   289
    LIBAWT_XAWT_EXCLUDES := medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   290
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   291
    LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   292
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   293
        -I$(TOPDIR)/src/java.desktop/share/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   294
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   295
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   296
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   297
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   298
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   299
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   300
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   301
        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   302
        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   303
        $(LIBJAVA_HEADER_FLAGS)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   304
        #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   305
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   306
    LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   307
        -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
47507
5a270d2dfa5d 8170681: Remove fontconfig header files from JDK source tree
prr
parents: 47314
diff changeset
   308
        $(FONTCONFIG_CFLAGS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   309
        $(CUPS_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   310
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   311
    ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   312
      LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   313
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   314
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   315
    ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   316
      ifeq ($(DISABLE_XRENDER), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   317
        LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   318
      endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   319
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   320
49241
de4b3a04feae 8199606: Set -lc as global LIBS on solstudio
ihse
parents: 49239
diff changeset
   321
    LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   322
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   323
    ifeq ($(OPENJDK_TARGET_OS), linux)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   324
      LIBAWT_XAWT_LIBS += -lpthread
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   325
    endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   326
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   327
    ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   328
      # Turn off all warnings for the following files since they contain warnings
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   329
      # that cannot be turned of individually.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   330
      # redefining a macro
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   331
      BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   332
      # comparison between pointer and integer
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   333
      BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   334
      # initializing a declared 'extern'
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   335
      BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   336
   endif
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   337
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   338
    $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   339
        NAME := awt_xawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   340
        SRC := $(LIBAWT_XAWT_DIRS), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   341
        EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
        OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   343
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   344
            $(X_CFLAGS), \
37529
868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents: 36110
diff changeset
   345
        WARNINGS_AS_ERRORS_xlc := false, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   346
        DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
42194
4c928df88d20 8160146: Resolve disabled GCC warning 'deprecated-declarations' for libawt_xawt
aghaisas
parents: 41132
diff changeset
   347
            unused-result maybe-uninitialized format \
48766
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   348
            format-security int-to-pointer-cast parentheses \
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   349
            implicit-fallthrough, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   350
        DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   351
            E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   352
        MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   353
        LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   354
            $(call SET_SHARED_LIBRARY_ORIGIN) \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   355
            -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   356
        LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   357
        RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   358
            -D "JDK_FNAME=xawt.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   359
            -D "JDK_INTERNAL_NAME=xawt" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   360
            -D "JDK_FTYPE=0x2L", \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   361
    ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   362
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   363
    $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   364
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   365
    $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   366
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   367
    TARGETS += $(BUILD_LIBAWT_XAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   368
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   369
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   370
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   371
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   372
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   373
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   374
LIBLCMS_SRC := $(TOPDIR)/src/java.desktop/share/native/liblcms
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   375
LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   376
    -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   377
    -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   378
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   379
    #
33285
5b20fc9010b7 8086092: More palette improvements
prr
parents: 32872
diff changeset
   380
# The fast floor code loses precision.
5b20fc9010b7 8086092: More palette improvements
prr
parents: 32872
diff changeset
   381
LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   382
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   383
ifeq ($(USE_EXTERNAL_LCMS), true)
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   384
  # If we're using an external library, we'll just need the wrapper part.
42352
4036fe6d110d 8039103: "explicitly" is misspelled as "explicitely" in configure scripts
ihse
parents: 42340
diff changeset
   385
  # By including it explicitly, all other files will be excluded.
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   386
  BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   387
else
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   388
  BUILD_LIBLCMS_INCLUDE_FILES :=
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   389
  # If we're using the bundled library, we'll need to include it in the
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   390
  # include path explicitly. Otherwise the system headers will be used.
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   391
  LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   392
endif
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   393
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   394
$(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   395
    NAME := lcms, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   396
    SRC := $(LIBLCMS_SRC), \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   397
    INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   398
    OPTIMIZATION := HIGHEST, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   399
    CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   400
        $(LIBLCMS_CPPFLAGS) \
24540
41aa84a568f3 8042159: Allow using a system-installed lcms2
omajid
parents: 23592
diff changeset
   401
        $(LCMS_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   402
    CFLAGS_solaris := -xc99=no_lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   403
    CFLAGS_windows := -DCMS_IS_WINDOWS_, \
39550
8d587cab45d2 8160294: Some client libraries cannot be built with GCC 6
ysuenaga
parents: 39025
diff changeset
   404
    DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   405
    DISABLED_WARNINGS_clang := tautological-compare, \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   406
    DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
42747
807791cafb87 8170954: non-ASCII characters in lcms and harfbuzz break Windows builds on some locales
dbuck
parents: 42352
diff changeset
   407
    DISABLED_WARNINGS_microsoft := 4819, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   408
    MAPFILE := $(TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   409
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   410
        $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   411
    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
49640
dd76fcbda95f 8200383: Can't build on SPARC Hotspot with code which use math functions
kvn
parents: 49263
diff changeset
   412
    LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   413
    LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   414
))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   415
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   416
TARGETS += $(BUILD_LIBLCMS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   417
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   418
$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   419
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   420
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   421
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   422
LIBJAVAJPEG_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   423
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   424
BUILD_LIBJAVAJPEG_REORDER :=
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   425
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   426
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   427
    BUILD_LIBJAVAJPEG_REORDER := $(TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   428
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   429
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   430
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   431
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   432
# Suppress gcc warnings like "variable might be clobbered by 'longjmp'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   433
# or 'vfork'": this warning indicates that some variable is placed to
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   434
# a register by optimized compiler and it's value might be lost on longjmp().
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   435
# Recommended way to avoid such warning is to declare the variable as
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   436
# volatile to prevent the optimization. However, this approach does not
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   437
# work because we have to declare all variables as volatile in result.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   438
#ifndef CROSS_COMPILE_ARCH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   439
#  CC_43_OR_NEWER := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   440
#      $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   441
#          \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   442
#  ifeq ($(CC_43_OR_NEWER), 1)
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   443
#    BUILD_LIBJAVAJPEG_CFLAGS_linux += -Wno-clobbered
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   444
#  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   445
#endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   446
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   447
ifeq ($(USE_EXTERNAL_LIBJPEG), true)
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   448
  LIBJPEG_LIBS := -ljpeg
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   449
  BUILD_LIBJAVAJPEG_INCLUDE_FILES := \
33647
2665054d3864 8139932: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg]
omajid
parents: 33518
diff changeset
   450
      imageioJPEG.c \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   451
      jpegdecoder.c
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   452
  BUILD_LIBJAVAJPEG_HEADERS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   453
else
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   454
  LIBJPEG_LIBS :=
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   455
  BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   456
  BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   457
endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   458
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   459
$(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   460
    NAME := javajpeg, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   461
    SRC := $(LIBJAVAJPEG_SRC), \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   462
    INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   463
    OPTIMIZATION := HIGHEST, \
31159
6f5c7d192b2d 8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure
andrew
parents: 31157
diff changeset
   464
    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   465
        $(LIBJAVA_HEADER_FLAGS) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   466
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
48766
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   467
    DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   468
    MAPFILE := $(TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
33305
ed708a0e3482 8140223: fix the build with a toolchain with a linker defaulting to ld --as-needed
erikj
parents: 33285
diff changeset
   469
    LDFLAGS := $(LDFLAGS_JDKLIB) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   470
        $(call SET_SHARED_LIBRARY_ORIGIN), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   471
    LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   472
    LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   473
    REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   474
))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   475
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   476
$(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   477
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   478
TARGETS += $(BUILD_LIBJAVAJPEG)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   479
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   480
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   481
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   482
# Mac and Windows only use the native AWT lib, do not build libawt_headless
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   483
ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   484
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   485
  LIBAWT_HEADLESS_DIRS := $(TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   486
      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   487
      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   488
      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   489
      $(TOPDIR)/src/java.desktop/share/native/common/font \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   490
      #
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   491
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   492
  LIBAWT_HEADLESS_EXCLUDES := medialib
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   493
  LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   494
      $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   495
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   496
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   497
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   498
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   499
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   500
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   501
      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   502
      -I$(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   503
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   504
      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   505
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   506
      $(LIBJAVA_HEADER_FLAGS) \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   507
      #
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   508
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   509
  LIBAWT_HEADLESS_REORDER :=
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   510
  ifeq ($(OPENJDK_TARGET_OS), solaris)
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   511
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   512
      LIBAWT_HEADLESS_REORDER := $(TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   513
    endif
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   514
  endif
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   515
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   516
  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   517
      NAME := awt_headless, \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   518
      SRC := $(LIBAWT_HEADLESS_DIRS), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   519
      EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   520
      OPTIMIZATION := LOW, \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   521
      CFLAGS := $(CFLAGS_JDKLIB) \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   522
          -DHEADLESS=true \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   523
          -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   524
          $(CUPS_CFLAGS) \
47507
5a270d2dfa5d 8170681: Remove fontconfig header files from JDK source tree
prr
parents: 47314
diff changeset
   525
          $(FONTCONFIG_CFLAGS) \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   526
          $(X_CFLAGS) \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   527
          $(LIBAWT_HEADLESS_CFLAGS), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   528
      DISABLED_WARNINGS_xlc := 1506-356, \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   529
      DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   530
      MAPFILE := $(TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   531
      LDFLAGS := $(LDFLAGS_JDKLIB) \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   532
          $(call SET_SHARED_LIBRARY_ORIGIN), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   533
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   534
      REORDER := $(LIBAWT_HEADLESS_REORDER), \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   535
      LIBS_unix := -lawt -ljvm -ljava, \
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   536
      LIBS_linux := $(LIBM) $(LIBDL), \
49241
de4b3a04feae 8199606: Set -lc as global LIBS on solstudio
ihse
parents: 49239
diff changeset
   537
      LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   538
  ))
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   539
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   540
  # AIX warning explanation:
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   541
  # 1506-356 : (W) Compilation unit is empty.
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   542
  #            This happens during the headless build
37529
868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents: 36110
diff changeset
   543
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   544
  $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   545
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   546
  TARGETS += $(BUILD_LIBAWT_HEADLESS)
29006
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   547
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   548
endif
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   549
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   550
################################################################################
0d72c5ab72d8 8072116: [Solaris] : Fix for 8071710 needs to be updated for build dependency checking
prr
parents: 29002
diff changeset
   551
49234
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   552
ifeq ($(FREETYPE_TO_USE), system)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   553
  LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   554
  LIBFREETYPE_LIBS := $(FREETYPE_LIBS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   555
else
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   556
  LIBFREETYPE_SRC := $(TOPDIR)/src/java.desktop/share/native/libfreetype
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   557
  BUILD_LIBFREETYPE_HEADERS := $(addprefix -I, $(LIBFREETYPE_SRC)/include)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   558
  LIBFREETYPE_CFLAGS := $(BUILD_LIBFREETYPE_HEADERS)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   559
  ifeq ($(OPENJDK_TARGET_OS), windows)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   560
    LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   561
  else
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   562
    LIBFREETYPE_LIBS := -lfreetype
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   563
  endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   564
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   565
  $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
49234
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   566
      NAME := freetype, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   567
      SRC := $(LIBFREETYPE_SRC)/src, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   568
      OPTIMIZATION := HIGHEST, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   569
      CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFREETYPE_HEADERS) \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   570
          -DFT2_BUILD_LIBRARY, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   571
      DISABLED_WARNINGS_solstudio := \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   572
         E_STATEMENT_NOT_REACHED \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   573
         E_END_OF_LOOP_CODE_NOT_REACHED, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   574
      DISABLED_WARNINGS_microsoft := 4267 2220 4244, \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   575
      LDFLAGS := $(LDFLAGS_JDKLIB) \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   576
          $(call SET_SHARED_LIBRARY_ORIGIN), \
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   577
  ))
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   578
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   579
  TARGETS += $(BUILD_LIBFREETYPE)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   580
endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   581
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   582
###########################################################################
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   583
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   584
LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   585
    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   586
LIBFONTMANAGER_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   587
    $(addprefix -I, $(shell $(FIND) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   588
      $(LIBFONTMANAGER_SRC) \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   589
      $(TOPDIR)/src/java.desktop/share/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   590
      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   591
      $(TOPDIR)/src/java.desktop/share/native/common \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   592
      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   593
    -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   594
    $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   595
    #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   596
34414
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   597
#### Begin harfbuzz configuration
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   598
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   599
HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   600
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   601
ifneq ($(OPENJDK_TARGET_OS), windows)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   602
  HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   603
                      -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   604
endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   605
ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   606
  HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   607
endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   608
ifeq ($(OPENJDK_TARGET_OS), solaris)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   609
  HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   610
endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   611
ifeq ($(OPENJDK_TARGET_OS), macosx)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   612
  HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   613
endif
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   614
ifneq ($(OPENJDK_TARGET_OS), macosx)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   615
  LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   616
endif
34432
958d65712d3e 8144616: Problem building OpenJDK/harfbuzz on jprt
prr
parents: 34414
diff changeset
   617
# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
958d65712d3e 8144616: Problem building OpenJDK/harfbuzz on jprt
prr
parents: 34414
diff changeset
   618
LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
34414
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   619
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   620
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   621
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   622
#### End harfbuzz configuration
e496a8d8fc8a 8143177: Integrate harfbuzz opentype layout engine per JEP 258
prr
parents: 33647
diff changeset
   623
49234
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   624
LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
39504
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 39025
diff changeset
   625
# This may be overridden in a custom makefile
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   626
BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
49234
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   627
BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   628
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   629
LIBFONTMANAGER_OPTIMIZATION := HIGH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   630
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   631
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   632
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   633
      X11TextRenderer.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   634
  LIBFONTMANAGER_OPTIMIZATION := HIGHEST
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   635
  LIBFONTMANAGER_CFLAGS += -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   636
else ifeq ($(OPENJDK_TARGET_OS), macosx)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   637
  LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   638
      X11TextRenderer.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   639
      fontpath.c \
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   640
      lcdglyph.c
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   641
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   642
  LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   643
      lcdglyph.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   644
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   645
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   646
LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   647
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   648
ifeq ($(TOOLCHAIN_TYPE), gcc)
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   649
  # Turn off all warnings for sunFont.c. This is needed because the specific warning
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   650
  # about discarding 'const' qualifier cannot be turned off individually.
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   651
  BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   652
  # Turn off aliasing with GCC for ExtensionSubtables.cpp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   653
  BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   654
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   655
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   656
$(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   657
    NAME := fontmanager, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   658
    SRC := $(LIBFONTMANAGER_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   659
    EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   660
        AccelGlyphCache.c, \
29931
64e274ed6567 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29734
diff changeset
   661
    TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   662
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   663
    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   664
    OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   665
    CFLAGS_windows = -DCC_NOEX, \
37529
868c7195632c 8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
simonis
parents: 36110
diff changeset
   666
    WARNINGS_AS_ERRORS_xlc := false, \
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   667
    DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \
48766
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   668
        type-limits missing-field-initializers implicit-fallthrough, \
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   669
    DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   670
        maybe-uninitialized, \
30434
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   671
    DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
6b881118c93b 8074859: Turn on warnings as error
ihse
parents: 30325
diff changeset
   672
        tautological-constant-out-of-range-compare int-to-pointer-cast, \
35711
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   673
    DISABLED_WARNINGS_C_solstudio = \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   674
        E_INTEGER_OVERFLOW_DETECTED \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   675
        E_ARG_INCOMPATIBLE_WITH_ARG_L \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   676
        E_ENUM_VAL_OVERFLOWS_INT_MAX, \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   677
    DISABLED_WARNINGS_CXX_solstudio := \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   678
        truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
d08f24178498 8148629: Disable remaining warnings in awt/fontmanager
erikj
parents: 35276
diff changeset
   679
        hidevf w_novirtualdescr arrowrtn2, \
48274
51772bf1fb0c 8188836: Upgrade to Harfbuzz 1.7.1 in JDK 10
prr
parents: 48040
diff changeset
   680
    DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   681
    MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
48731
c832897a3a23 8196509: Linux UI applications broken by the build change for JDK-8196218
prr
parents: 48730
diff changeset
   682
    LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   683
        $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   684
    LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   685
    LDFLAGS_macosx := -undefined dynamic_lookup, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   686
    LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   687
    LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   688
    LIBS_aix := -lawt_headless,\
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   689
    LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   690
        $(WIN_AWT_LIB), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   691
))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   692
48040
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   693
$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   694
48731
c832897a3a23 8196509: Linux UI applications broken by the build change for JDK-8196218
prr
parents: 48730
diff changeset
   695
ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
48040
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   696
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   697
endif
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   698
49234
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   699
ifeq ($(FREETYPE_TO_USE), bundled)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   700
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   701
endif
3375a8039fde 8193017: Import freetype sources into OpenJDK source tree
prr
parents: 49106
diff changeset
   702
48040
26f1193f1348 8192876: MacOS build fails intermittently after JDK-8139653
erikj
parents: 48032
diff changeset
   703
TARGETS += $(BUILD_LIBFONTMANAGER)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   704
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   705
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   706
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   707
ifeq ($(OPENJDK_TARGET_OS), windows)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   708
  LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   709
  LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   710
      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   711
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   712
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   713
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   714
      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   715
      -I$(TOPDIR)/src/java.desktop/windows/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   716
      -I$(TOPDIR)/src/java.desktop/share/native/include \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   717
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   718
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   719
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   720
  ifeq ($(OPENJDK_TARGET_CPU), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   721
    KERNEL32_LIB := kernel32.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   722
  endif
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   723
  $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   724
      NAME := jawt, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   725
      SRC := $(LIBJAWT_SRC), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   726
      INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   727
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   728
      CFLAGS := $(CXXFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   729
          -EHsc -DUNICODE -D_UNICODE \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   730
          $(LIBJAWT_CFLAGS), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   731
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   732
      LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   733
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   734
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   735
  $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   736
45781
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   737
  $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
49263
78af880eec61 8199749: Debug symbols are not copied to exploded image on Mac
erikj
parents: 49261
diff changeset
   738
      FILES := $(BUILD_LIBJAWT_IMPORT_LIBRARY), \
45781
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   739
      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   740
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   741
45781
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   742
  $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   743
0491f891667c 8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
erikj
parents: 43806
diff changeset
   744
  TARGETS += $(COPY_JAWT_LIB)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   745
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   746
else # OPENJDK_TARGET_OS not windows
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   747
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   748
  ifeq ($(OPENJDK_TARGET_OS), macosx)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   749
    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   750
  else
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   751
    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   752
  endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   753
  LIBJAWT_CFLAGS := \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   754
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   755
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   756
      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   757
      -I$(TOPDIR)/src/java.desktop/share/native/include \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   758
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   759
      #
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   760
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   761
  ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   762
    JAWT_LIBS := -lawt_lwawt
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   763
  else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   764
    JAWT_LIBS :=
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   765
    ifneq ($(OPENJDK_TARGET_OS), solaris)
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   766
      JAWT_LIBS += -lawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   767
    endif
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   768
    ifeq ($(ENABLE_HEADLESS_ONLY), false)
21130
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   769
      JAWT_LIBS += -lawt_xawt
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   770
    else
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   771
      JAWT_LIBS += -lawt_headless
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   772
      HEADLESS_CFLAG += -DHEADLESS
0f0b9c8f701a 8025673: [macosx] Disable X11 AWT toolkit
dholmes
parents: 20901
diff changeset
   773
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   774
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   775
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   776
  $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   777
      NAME := jawt, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   778
      SRC := $(LIBJAWT_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   779
      INCLUDE_FILES := $(JAWT_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   780
      OPTIMIZATION := LOW, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   781
      CFLAGS := $(CFLAGS_JDKLIB) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   782
          $(LIBJAWT_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   783
      CFLAGS_linux := $(HEADLESS_CFLAG), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   784
      CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   785
      MAPFILE := $(TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   786
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   787
          $(call SET_SHARED_LIBRARY_ORIGIN), \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   788
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
34695
7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34432
diff changeset
   789
      LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   790
      LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   791
      LIBS_solaris := $(X_LIBS) -lXrender, \
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   792
      LIBS_macosx := -framework Cocoa, \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   793
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   794
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   795
  ifeq ($(ENABLE_HEADLESS_ONLY), false)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   796
    $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   797
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   798
    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   799
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   800
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   801
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   802
    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   803
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   804
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   805
endif # OPENJDK_TARGET_OS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   806
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   807
TARGETS += $(BUILD_LIBJAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   808
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   809
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   810
41132
2a3c61e80af0 8163102: Fix headless only configuration option
erikj
parents: 40205
diff changeset
   811
ifeq ($(ENABLE_HEADLESS_ONLY), false)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   812
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   813
  LIBSPLASHSCREEN_DIRS := \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   814
      $(TOPDIR)/src/java.desktop/share/native/libjavajpeg \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   815
      $(TOPDIR)/src/java.desktop/share/native/libsplashscreen \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   816
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   817
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   818
  ifeq ($(USE_EXTERNAL_LIBGIF), true)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   819
    GIFLIB_LIBS := -lgif
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   820
    LIBSPLASHSCREEN_EXCLUDES := giflib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   821
  else
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   822
    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   823
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   824
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   825
  ifeq ($(USE_EXTERNAL_LIBJPEG), true)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   826
    LIBJPEG_LIBS := -ljpeg
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   827
  else
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   828
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   829
    LIBJPEG_CFLAGS := -I$(TOPDIR)/src/java.desktop/share/native/libjavajpeg
25103
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   830
  endif
4dcb7cd7652e 8043805: Allow using a system-installed libjpeg
omajid
parents: 24566
diff changeset
   831
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   832
  ifeq ($(USE_EXTERNAL_LIBPNG), false)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   833
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   834
  else
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   835
    LIBSPLASHSCREEN_EXCLUDES += libpng
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   836
  endif
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   837
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   838
  ifneq ($(OPENJDK_TARGET_OS), macosx)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   839
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   840
  else
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   841
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   842
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   843
36953
d707077d2f74 8153727: AIX jdk build broken after 8145174
stuefe
parents: 36907
diff changeset
   844
  ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   845
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
36869
f8ef78f4157d 8145174: HiDPI splash screen support on Linux
rchamyal
parents: 36110
diff changeset
   846
  endif
36880
3a05117c7611 8151770: 9-client windows builds fail on windows since make file change for 8145174
erikj
parents: 36869
diff changeset
   847
36907
c3d8383e3efb 8145173: HiDPI splash screen support on Windows
rchamyal
parents: 36880
diff changeset
   848
  ifeq ($(OPENJDK_TARGET_OS), windows)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   849
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
42340
bf1c934665a9 8056215: AWT source dirs should only point to java2d, not below
ihse
parents: 42194
diff changeset
   850
  endif
30325
1472b22475f2 8078245: AARCH64: JDK fails to build due to undefined symbol in libpng
enevill
parents: 29931
diff changeset
   851
  LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   852
      $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   853
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   854
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   855
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   856
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   857
    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   858
    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   859
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   860
    BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   861
    BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   862
    BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   863
    BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   864
    BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   865
    BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   866
    BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   867
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   868
  else ifeq ($(OPENJDK_TARGET_OS), windows)
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   869
    LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   870
  else
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   871
    LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   872
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   873
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   874
  LIBSPLASHSCREEN_LIBS :=
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   875
48751
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   876
  ifeq ($(USE_EXTERNAL_LIBZ), false)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   877
    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
48751
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   878
  else
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   879
    ifeq ($(OPENJDK_TARGET_OS), macosx)
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   880
      ifeq ($(USE_EXTERNAL_LIBPNG), false)
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   881
        # When building our own libpng and using an external libz, we need to
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   882
        # inject our own libz.h to tweak the exported ZLIB_VERNUM macro. See
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   883
        # $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   884
        # for details.
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   885
        LIBSPLASHSCREEN_CFLAGS += -iquote $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen/libpng
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   886
      endif
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   887
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   888
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   889
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   890
  ifeq ($(OPENJDK_TARGET_OS), macosx)
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   891
    LIBSPLASHSCREEN_LIBS += \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   892
        $(LIBM) -lpthread -liconv -losxapp \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   893
        -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   894
        -framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   895
        -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   896
        -framework JavaNativeFoundation
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   897
  else ifeq ($(OPENJDK_TARGET_OS), windows)
36907
c3d8383e3efb 8145173: HiDPI splash screen support on Windows
rchamyal
parents: 36880
diff changeset
   898
    LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
23592
35b16ae6b4f4 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 23310
diff changeset
   899
  else
39844
a3cc7e551a48 8149115: [hidpi] Linux: display-wise scaling factor should probably be taken into account
ssadetsky
parents: 39550
diff changeset
   900
    LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   901
  endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   902
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   903
  $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   904
      NAME := splashscreen, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   905
      SRC := $(LIBSPLASHSCREEN_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   906
      EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   907
      EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   908
      OPTIMIZATION := LOW, \
23305
e7d0093bfc6c 8035341: Allow using a system installed libpng
omajid
parents: 23292
diff changeset
   909
      CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
48751
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   910
          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
48766
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   911
      DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
2c4d1993b5f9 8196985: Disable new warnings from GCC 7.3 in jdk libraries
erikj
parents: 48751
diff changeset
   912
          maybe-uninitialized shift-negative-value implicit-fallthrough, \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   913
      DISABLED_WARNINGS_clang := incompatible-pointer-types, \
32408
97230ec16697 8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents: 31159
diff changeset
   914
      DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
97230ec16697 8134408: Disable warnings for jdk libraries triggered by SS12u4
erikj
parents: 31159
diff changeset
   915
          E_STATEMENT_NOT_REACHED, \
30502
50552a5900a2 8080317: Disable warning treated as error for signed/unsigned comparison in building splashscreen
prr
parents: 30439
diff changeset
   916
      DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   917
      MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
49239
c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage
ihse
parents: 49234
diff changeset
   918
      LDFLAGS := $(LDFLAGS_JDKLIB) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   919
          $(call SET_SHARED_LIBRARY_ORIGIN), \
49239
c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage
ihse
parents: 49234
diff changeset
   920
      LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
c35ec365e329 8199483: Clean up some non-standard LDFLAGS usage
ihse
parents: 49234
diff changeset
   921
      LDFLAGS_windows := -delayload:user32.dll, \
48751
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   922
      LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
54f355e65415 8196803: Fix build warnings in jdk libraries with Xcode 9
erikj
parents: 48731
diff changeset
   923
          $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
33518
3f1644328d06 8141290: AIX: fix build after '8140661: Rename LDFLAGS_SUFFIX to LIBS'
simonis
parents: 33406
diff changeset
   924
      LIBS_aix := -liconv, \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
   925
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   926
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   927
  TARGETS += $(BUILD_LIBSPLASHSCREEN)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   928
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   929
  ifeq ($(OPENJDK_TARGET_OS), macosx)
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
   930
    $(BUILD_LIBSPLASHSCREEN): $(call FindLib, java.desktop, osxapp)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   931
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   932
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   933
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   934
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
   935
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   936
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   937
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   938
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   939
  LIBAWT_LWAWT_DIRS := \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   940
      $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   941
      $(TOPDIR)/src/java.desktop/unix/native/common/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   942
      $(TOPDIR)/src/java.desktop/share/native/common/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   943
      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   944
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   945
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   946
  LIBAWT_LWAWT_CFLAGS := \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   947
      $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   948
      -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   949
      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   950
      -I$(TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   951
      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   952
      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   953
      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   954
      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   955
      -I$(TOPDIR)/src/java.desktop/macosx/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   956
      -I$(TOPDIR)/src/java.desktop/share/native/include \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   957
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   958
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   959
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   960
      -I$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   961
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   962
      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   963
      -I$(TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   964
      -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   965
      $(LIBJAVA_HEADER_FLAGS) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   966
      #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   967
26741
bc80bcd0765a 8056213: Clean up unix/native/common/sun/awt
prr
parents: 26611
diff changeset
   968
  LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   969
  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   970
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
   971
  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
   972
      NAME := awt_lwawt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   973
      SRC := $(LIBAWT_LWAWT_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   974
      INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   975
      EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   976
      EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   977
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   978
      CFLAGS := $(CFLAGS_JDKLIB) \
20901
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   979
          $(X_CFLAGS) \
70f69e624fc9 8026888: Licensee build failure due to wrong libs being called
erikj
parents: 20899
diff changeset
   980
          $(X_LIBS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25563
diff changeset
   981
          $(LIBAWT_LWAWT_CFLAGS), \
32872
abca6234313d 8079965: Stop ignoring warnings for libawt_lwawt
serb
parents: 32408
diff changeset
   982
      DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
29374
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   983
          deprecated-declarations objc-method-access bitwise-op-parentheses \
f031a666744a 8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents: 29006
diff changeset
   984
          incompatible-pointer-types parentheses-equality extra-tokens, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   985
      LDFLAGS := $(LDFLAGS_JDKLIB) \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
   986
          $(call SET_SHARED_LIBRARY_ORIGIN) \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
   987
          -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
   988
      LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   989
          -framework Accelerate \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   990
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   991
          -framework AudioToolbox \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   992
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   993
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   994
          -framework Security \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   995
          -framework ExceptionHandling \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   996
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   997
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   998
          -framework OpenGL \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   999
          -framework QuartzCore -ljava, \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
  1000
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1001
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1002
  TARGETS += $(BUILD_LIBAWT_LWAWT)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1003
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1004
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1005
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1006
  $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1007
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
  1008
  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.desktop, osxapp)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1009
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1010
  $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1011
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1012
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1013
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1014
################################################################################
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1015
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1016
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1017
49244
995a5556edfa 8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
ihse
parents: 49241
diff changeset
  1018
  $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
49070
d7859531621b 8198751: Refactor SetupNativeCompilation to take NAME and TYPE
ihse
parents: 48766
diff changeset
  1019
      NAME := osxui, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1020
      SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1021
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1022
      CFLAGS := $(CFLAGS_JDKLIB) \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1023
          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1024
          -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1025
          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1026
          -I$(TOPDIR)/src/java.base/share/native/libjava \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
  1027
          -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1028
          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop,  \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1029
      LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1030
          $(call SET_SHARED_LIBRARY_ORIGIN) \
34695
7a6cc9982d22 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34432
diff changeset
  1031
          -Wl$(COMMA)-rpath$(COMMA)@loader_path \
27944
c6d5edd39016 8066752: Remove space after -L on linker lines
erikj
parents: 27799
diff changeset
  1032
          -L$(INSTALL_LIBRARIES_HERE), \
33406
4680f7495292 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33305
diff changeset
  1033
      LIBS := -lawt -losxapp -lawt_lwawt \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1034
          -framework Cocoa \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1035
          -framework Carbon \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1036
          -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1037
          -framework JavaNativeFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1038
          -framework JavaRuntimeSupport \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1039
          -ljava -ljvm, \
35276
50b3cdcef339 8145596: Enable debug symbols for all libraries
ihse
parents: 35241
diff changeset
  1040
  ))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1041
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 26751
diff changeset
  1042
  TARGETS += $(BUILD_LIBOSXUI)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1043
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1044
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1045
49261
d5c43e9f08fb 8199745: JDK-8199668 introduced a build race on macosx
erikj
parents: 49244
diff changeset
  1046
  $(BUILD_LIBOSXUI): $(call FindLib, java.desktop, osxapp)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1047
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1048
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1049
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
  1050
endif
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1051
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1052
################################################################################
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1053
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25993
diff changeset
  1054
# Hook to include the corresponding custom file, if present.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
  1055
$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))