114 LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \ |
114 LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \ |
115 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
115 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
116 $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
116 $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
117 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
117 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
118 # |
118 # |
|
119 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |
|
120 LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib |
|
121 endif |
119 |
122 |
120 ifeq ($(OPENJDK_TARGET_OS), aix) |
123 ifeq ($(OPENJDK_TARGET_OS), aix) |
121 LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt |
124 LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt |
122 endif |
125 endif |
123 |
126 |
124 ifeq ($(OPENJDK_TARGET_OS), windows) |
127 ifeq ($(OPENJDK_TARGET_OS), windows) |
125 LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility |
128 LIBAWT_DIRS += \ |
|
129 $(TOPDIR)/src/java.desktop/share/native/common/awt/utility \ |
|
130 $(TOPDIR)/src/java.desktop/share/native/common/font \ |
|
131 $(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
|
132 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \ |
|
133 # |
126 endif |
134 endif |
127 |
135 |
128 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
136 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
129 LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
137 LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
130 endif |
138 endif |
152 ifneq ($(OPENJDK_TARGET_OS), solaris) |
160 ifneq ($(OPENJDK_TARGET_OS), solaris) |
153 LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH |
161 LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH |
154 endif |
162 endif |
155 |
163 |
156 ifeq ($(OPENJDK_TARGET_OS), windows) |
164 ifeq ($(OPENJDK_TARGET_OS), windows) |
157 LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/font \ |
|
158 $(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
|
159 $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \ |
|
160 # |
|
161 |
|
162 # Why does libawt need java.base headers? |
165 # Why does libawt need java.base headers? |
163 LIBAWT_HEADER_FLAGS += \ |
166 LIBAWT_HEADER_FLAGS += \ |
164 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
167 -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
165 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
168 -I$(TOPDIR)/src/java.desktop/windows/native/include \ |
166 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
169 -I$(TOPDIR)/src/java.desktop/share/native/include \ |
199 SRC := $(LIBAWT_DIRS), \ |
202 SRC := $(LIBAWT_DIRS), \ |
200 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
203 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
201 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
204 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
202 OPTIMIZATION := LOW, \ |
205 OPTIMIZATION := LOW, \ |
203 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
206 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
204 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
|
205 HEADER_FLAGS := \ |
207 HEADER_FLAGS := \ |
206 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
208 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
207 -I$(call FindHeaderDirForModule, java.base) \ |
209 -I$(call FindHeaderDirForModule, java.base) \ |
208 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
210 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
209 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \ |
211 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \ |
|
212 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/loops)) \ |
210 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/opengl)) \ |
213 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/opengl)) \ |
211 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/windows)) \ |
214 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/windows)) \ |
212 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/windows)) \ |
215 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/windows)) \ |
|
216 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/medialib)) \ |
213 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, mlib_image)) \ |
217 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, mlib_image)) \ |
214 $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \ |
218 $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \ |
215 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
219 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
216 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
220 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
217 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
221 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
218 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
222 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
219 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/medialib \ |
223 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/medialib \ |
220 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
224 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe, \ |
221 -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops, \ |
|
222 DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ |
225 DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ |
223 format-nonliteral parentheses, \ |
226 format-nonliteral parentheses, \ |
224 DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ |
227 DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \ |
225 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
228 DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ |
226 DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \ |
229 DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \ |