equal
deleted
inserted
replaced
744 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ |
744 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ |
745 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ |
745 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \ |
746 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \ |
746 -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \ |
747 $(LIBJAVA_HEADER_FLAGS) \ |
747 $(LIBJAVA_HEADER_FLAGS) \ |
748 # |
748 # |
749 LIBAWT_HEADLESS_EXFILES := initIDs.c |
|
750 |
749 |
751 LIBAWT_HEADLESS_REORDER := |
750 LIBAWT_HEADLESS_REORDER := |
752 ifeq ($(OPENJDK_TARGET_OS), solaris) |
751 ifeq ($(OPENJDK_TARGET_OS), solaris) |
753 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
752 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
754 LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU) |
753 LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU) |
757 |
756 |
758 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \ |
757 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \ |
759 LIBRARY := awt_headless, \ |
758 LIBRARY := awt_headless, \ |
760 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
759 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
761 SRC := $(LIBAWT_HEADLESS_DIRS), \ |
760 SRC := $(LIBAWT_HEADLESS_DIRS), \ |
762 EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \ |
|
763 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
761 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
764 LANG := C, \ |
762 LANG := C, \ |
765 OPTIMIZATION := LOW, \ |
763 OPTIMIZATION := LOW, \ |
766 CFLAGS := $(CFLAGS_JDKLIB) \ |
764 CFLAGS := $(CFLAGS_JDKLIB) \ |
767 -DHEADLESS=true \ |
765 -DHEADLESS=true \ |
928 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ |
926 -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \ |
929 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
927 -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
930 $(LIBJAVA_HEADER_FLAGS) \ |
928 $(LIBJAVA_HEADER_FLAGS) \ |
931 # |
929 # |
932 |
930 |
933 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c initIDs.c |
931 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
934 LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib |
932 LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib |
935 |
933 |
936 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \ |
934 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \ |
937 LIBRARY := awt_lwawt, \ |
935 LIBRARY := awt_lwawt, \ |
938 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
936 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |