29 |
29 |
30 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
30 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
31 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib |
31 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib |
32 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ |
32 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ |
33 $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ |
33 $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \ |
34 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image |
34 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image |
35 |
35 |
36 BUILD_LIBMLIB_LDLIBS := |
36 BUILD_LIBMLIB_LDLIBS := |
37 BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers |
37 BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers |
38 |
38 |
39 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH |
39 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH |
142 endif |
142 endif |
143 |
143 |
144 ################################################################################ |
144 ################################################################################ |
145 |
145 |
146 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ |
146 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ |
147 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \ |
147 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
148 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
148 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
149 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ |
149 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
150 # |
150 # |
151 |
151 |
152 ifeq ($(OPENJDK_TARGET_OS), aix) |
152 ifeq ($(OPENJDK_TARGET_OS), aix) |
153 LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt |
153 LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt |
154 endif |
154 endif |
209 LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
209 LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
210 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
210 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
211 # Why does libawt need java.base headers? |
211 # Why does libawt need java.base headers? |
212 LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
212 LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
213 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
213 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
214 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ |
214 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
215 -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
215 -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
216 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
216 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
217 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
217 -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ |
218 # |
218 # |
219 LIBAWT_EXFILES += \ |
219 LIBAWT_EXFILES += \ |
297 |
297 |
298 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) |
298 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) |
299 ifndef BUILD_HEADLESS_ONLY |
299 ifndef BUILD_HEADLESS_ONLY |
300 |
300 |
301 LIBAWT_XAWT_DIRS := \ |
301 LIBAWT_XAWT_DIRS := \ |
302 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \ |
302 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \ |
303 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \ |
303 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt \ |
304 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
304 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
305 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \ |
305 $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \ |
306 $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
306 $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
307 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
307 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
308 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ |
308 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
309 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \ |
309 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \ |
310 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ |
310 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
311 # |
311 # |
312 |
312 |
313 LIBAWT_XAWT_EXCLUDES := medialib |
313 LIBAWT_XAWT_EXCLUDES := medialib |
314 |
314 |
315 LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ |
315 LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \ |
316 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
316 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
317 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
317 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
318 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
318 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
319 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ |
319 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ |
320 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
320 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
321 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \ |
321 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \ |
322 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
322 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
323 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
323 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
324 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
324 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
325 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
325 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
326 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \ |
326 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga \ |
327 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \ |
327 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \ |
328 $(LIBJAVA_HEADER_FLAGS) |
328 $(LIBJAVA_HEADER_FLAGS) |
329 # |
329 # |
330 |
330 |
331 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
331 LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \ |
332 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
332 -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ |
419 CFLAGS_solaris := -xc99=no_lib, \ |
419 CFLAGS_solaris := -xc99=no_lib, \ |
420 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
420 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
421 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ |
421 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ |
422 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
422 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
423 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
423 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
424 LDFLAGS_posix := -L $(INSTALL_LIBRARIES_HERE), \ |
424 LDFLAGS_unix := -L $(INSTALL_LIBRARIES_HERE), \ |
425 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
425 LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \ |
426 LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
426 LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ |
427 LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \ |
427 LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \ |
428 LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ |
428 LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \ |
429 LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ |
429 LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \ |
515 TARGETS += $(BUILD_LIBJAVAJPEG) |
515 TARGETS += $(BUILD_LIBJAVAJPEG) |
516 |
516 |
517 ################################################################################ |
517 ################################################################################ |
518 |
518 |
519 LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \ |
519 LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \ |
520 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager |
520 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager |
521 LIBFONTMANAGER_CFLAGS := \ |
521 LIBFONTMANAGER_CFLAGS := \ |
522 $(addprefix -I, $(shell $(FIND) \ |
522 $(addprefix -I, $(shell $(FIND) \ |
523 $(LIBFONTMANAGER_SRC) \ |
523 $(LIBFONTMANAGER_SRC) \ |
524 $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ |
524 $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \ |
525 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \ |
525 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \ |
526 $(JDK_TOPDIR)/src/java.desktop/share/native/common \ |
526 $(JDK_TOPDIR)/src/java.desktop/share/native/common \ |
527 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common -type d)) \ |
527 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \ |
528 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
528 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
529 $(LIBJAVA_HEADER_FLAGS) \ |
529 $(LIBJAVA_HEADER_FLAGS) \ |
530 # |
530 # |
531 |
531 |
532 ifndef OPENJDK |
532 ifndef OPENJDK |
543 |
543 |
544 ifeq ($(OPENJDK_TARGET_OS), windows) |
544 ifeq ($(OPENJDK_TARGET_OS), windows) |
545 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
545 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
546 X11TextRenderer.c |
546 X11TextRenderer.c |
547 LIBFONTMANAGER_OPTIMIZATION := HIGHEST |
547 LIBFONTMANAGER_OPTIMIZATION := HIGHEST |
548 LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows |
548 LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows |
549 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
549 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
550 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
550 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
551 X11TextRenderer.c \ |
551 X11TextRenderer.c \ |
552 fontpath.c \ |
552 fontpath.c \ |
553 lcdglyph.c |
553 lcdglyph.c |
579 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
579 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
580 CFLAGS_windows = -DCC_NOEX, \ |
580 CFLAGS_windows = -DCC_NOEX, \ |
581 MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
581 MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
582 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
582 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
583 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
583 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
584 LDFLAGS_posix := -L $(INSTALL_LIBRARIES_HERE), \ |
584 LDFLAGS_unix := -L $(INSTALL_LIBRARIES_HERE), \ |
585 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
585 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
586 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
586 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
587 LDFLAGS_SUFFIX_solaris := $(filter-out -R%, $(X_LIBS)) \ |
587 LDFLAGS_SUFFIX_solaris := $(filter-out -R%, $(X_LIBS)) \ |
588 -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
588 -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
589 LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
589 LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
608 TARGETS += $(BUILD_LIBFONTMANAGER) |
608 TARGETS += $(BUILD_LIBFONTMANAGER) |
609 |
609 |
610 ################################################################################ |
610 ################################################################################ |
611 |
611 |
612 ifeq ($(OPENJDK_TARGET_OS), windows) |
612 ifeq ($(OPENJDK_TARGET_OS), windows) |
613 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt |
613 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt |
614 LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows \ |
614 LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \ |
615 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
615 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
616 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
616 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
617 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
617 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
618 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d/windows \ |
618 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \ |
619 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
619 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
620 -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
620 -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \ |
621 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
621 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
622 $(LIBJAVA_HEADER_FLAGS) \ |
622 $(LIBJAVA_HEADER_FLAGS) \ |
623 # |
623 # |
657 else # OPENJDK_TARGET_OS not windows |
657 else # OPENJDK_TARGET_OS not windows |
658 |
658 |
659 ifeq ($(OPENJDK_TARGET_OS), macosx) |
659 ifeq ($(OPENJDK_TARGET_OS), macosx) |
660 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt |
660 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt |
661 else |
661 else |
662 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt |
662 LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt |
663 endif |
663 endif |
664 LIBJAWT_CFLAGS := \ |
664 LIBJAWT_CFLAGS := \ |
665 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ |
665 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
666 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
666 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \ |
667 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \ |
667 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \ |
668 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
668 -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \ |
669 $(LIBJAVA_HEADER_FLAGS) \ |
669 $(LIBJAVA_HEADER_FLAGS) \ |
670 # |
670 # |
671 |
671 |
672 ifeq ($(OPENJDK_TARGET_OS), macosx) |
672 ifeq ($(OPENJDK_TARGET_OS), macosx) |
696 CFLAGS_linux := $(HEADLESS_CFLAG), \ |
696 CFLAGS_linux := $(HEADLESS_CFLAG), \ |
697 CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \ |
697 CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \ |
698 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
698 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \ |
699 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
699 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
700 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
700 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
701 LDFLAGS_posix := -L $(INSTALL_LIBRARIES_HERE), \ |
701 LDFLAGS_unix := -L $(INSTALL_LIBRARIES_HERE), \ |
702 LDFLAGS_solaris := $(X_LIBS), \ |
702 LDFLAGS_solaris := $(X_LIBS), \ |
703 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
703 LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \ |
704 LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
704 LDFLAGS_SUFFIX_aix := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ |
705 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
705 LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \ |
706 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
706 LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ |
727 ifeq ($(BUILD_HEADLESS), true) |
727 ifeq ($(BUILD_HEADLESS), true) |
728 # Mac and Windows only use the native AWT lib, do not build libawt_headless |
728 # Mac and Windows only use the native AWT lib, do not build libawt_headless |
729 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) |
729 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),) |
730 |
730 |
731 LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \ |
731 LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \ |
732 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \ |
732 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \ |
733 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \ |
733 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \ |
734 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \ |
734 $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \ |
735 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
735 $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \ |
736 $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
736 $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
737 # |
737 # |
738 |
738 |
739 LIBAWT_HEADLESS_EXCLUDES := medialib |
739 LIBAWT_HEADLESS_EXCLUDES := medialib |
742 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
742 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \ |
743 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
743 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \ |
744 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
744 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \ |
745 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
745 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \ |
746 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
746 -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
747 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \ |
747 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \ |
748 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
748 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \ |
749 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
749 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \ |
750 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \ |
750 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \ |
751 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \ |
751 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \ |
752 $(LIBJAVA_HEADER_FLAGS) \ |
752 $(LIBJAVA_HEADER_FLAGS) \ |
753 # |
753 # |
754 |
754 |
755 LIBAWT_HEADLESS_REORDER := |
755 LIBAWT_HEADLESS_REORDER := |
756 ifeq ($(OPENJDK_TARGET_OS), solaris) |
756 ifeq ($(OPENJDK_TARGET_OS), solaris) |
773 $(X_CFLAGS) \ |
773 $(X_CFLAGS) \ |
774 $(LIBAWT_HEADLESS_CFLAGS), \ |
774 $(LIBAWT_HEADLESS_CFLAGS), \ |
775 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |
775 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \ |
776 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
776 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
777 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
777 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
778 LDFLAGS_posix := -L $(INSTALL_LIBRARIES_HERE), \ |
778 LDFLAGS_unix := -L $(INSTALL_LIBRARIES_HERE), \ |
779 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
779 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
780 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
780 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
781 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
781 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \ |
782 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
782 REORDER := $(LIBAWT_HEADLESS_REORDER), \ |
783 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
783 LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \ |
995 CFLAGS := $(CFLAGS_JDKLIB) \ |
995 CFLAGS := $(CFLAGS_JDKLIB) \ |
996 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \ |
996 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \ |
997 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ |
997 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ |
998 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
998 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
999 -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ |
999 -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ |
1000 -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \ |
1000 -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
1001 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
1001 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
1002 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1002 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
1003 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
1003 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
1004 -Xlinker -rpath -Xlinker @loader_path \ |
1004 -Xlinker -rpath -Xlinker @loader_path \ |
1005 -L $(INSTALL_LIBRARIES_HERE), \ |
1005 -L $(INSTALL_LIBRARIES_HERE), \ |