equal
deleted
inserted
replaced
54 |
54 |
55 ifeq ($(OPENJDK_TARGET_OS), aix) |
55 ifeq ($(OPENJDK_TARGET_OS), aix) |
56 BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) |
56 BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) |
57 endif |
57 endif |
58 |
58 |
59 $(eval $(call SetupNativeCompilation, BUILD_LIBNIO, \ |
59 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \ |
60 NAME := nio, \ |
60 NAME := nio, \ |
61 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
62 SRC := $(BUILD_LIBNIO_SRC), \ |
61 SRC := $(BUILD_LIBNIO_SRC), \ |
63 EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \ |
62 EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \ |
64 OPTIMIZATION := HIGH, \ |
63 OPTIMIZATION := HIGH, \ |
65 WARNINGS_AS_ERRORS_xlc := false, \ |
64 WARNINGS_AS_ERRORS_xlc := false, \ |
66 CFLAGS := $(CFLAGS_JDKLIB) \ |
65 CFLAGS := $(CFLAGS_JDKLIB) \ |
76 LIBS_macosx := \ |
75 LIBS_macosx := \ |
77 -framework CoreFoundation -framework CoreServices, \ |
76 -framework CoreFoundation -framework CoreServices, \ |
78 LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
77 LIBS_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
79 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet/net.lib \ |
78 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnet/net.lib \ |
80 advapi32.lib, \ |
79 advapi32.lib, \ |
81 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
|
82 RC_FLAGS := $(RC_FLAGS) \ |
|
83 -D "JDK_FNAME=nio.dll" \ |
|
84 -D "JDK_INTERNAL_NAME=nio" \ |
|
85 -D "JDK_FTYPE=0x2L", \ |
|
86 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libnio, \ |
|
87 )) |
80 )) |
88 |
81 |
89 TARGETS += $(BUILD_LIBNIO) |
82 TARGETS += $(BUILD_LIBNIO) |
90 |
83 |
91 $(BUILD_LIBNIO): $(BUILD_LIBNET) |
84 $(BUILD_LIBNIO): $(BUILD_LIBNET) |