equal
deleted
inserted
replaced
47 LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS)) |
47 LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS)) |
48 # equivalent of strcasecmp is stricmp on Windows |
48 # equivalent of strcasecmp is stricmp on Windows |
49 LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp |
49 LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp |
50 endif |
50 endif |
51 |
51 |
52 $(eval $(call SetupNativeCompilation, BUILD_LIBINSTRUMENT, \ |
52 $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ |
53 NAME := instrument, \ |
53 NAME := instrument, \ |
54 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
|
55 SRC := $(LIBINSTRUMENT_SRC), \ |
54 SRC := $(LIBINSTRUMENT_SRC), \ |
56 OPTIMIZATION := LOW, \ |
55 OPTIMIZATION := LOW, \ |
57 CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ |
56 CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ |
58 CFLAGS_debug := -DJPLIS_LOGGING, \ |
57 CFLAGS_debug := -DJPLIS_LOGGING, \ |
59 CFLAGS_release := -DNO_JPLIS_LOGGING, \ |
58 CFLAGS_release := -DNO_JPLIS_LOGGING, \ |
75 LIBS_macosx := -liconv -framework Cocoa -framework Security \ |
74 LIBS_macosx := -liconv -framework Cocoa -framework Security \ |
76 -framework ApplicationServices \ |
75 -framework ApplicationServices \ |
77 $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ |
76 $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \ |
78 LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
77 LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
79 $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ |
78 $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \ |
80 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
|
81 RC_FLAGS := $(RC_FLAGS) \ |
|
82 -D "JDK_FNAME=instrument.dll" \ |
|
83 -D "JDK_INTERNAL_NAME=instrument" \ |
|
84 -D "JDK_FTYPE=0x2L", \ |
|
85 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libinstrument, \ |
|
86 )) |
79 )) |
87 |
80 |
88 ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix)) |
81 ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix)) |
89 $(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) |
82 $(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) |
90 else |
83 else |