equal
deleted
inserted
replaced
281 ifeq ($(OPENJDK_TARGET_OS), windows) |
281 ifeq ($(OPENJDK_TARGET_OS), windows) |
282 BUILD_LIBJLI_FILES += java_md.c \ |
282 BUILD_LIBJLI_FILES += java_md.c \ |
283 cmdtoargs.c |
283 cmdtoargs.c |
284 # Staticically link with c runtime on windows. |
284 # Staticically link with c runtime on windows. |
285 LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS)) |
285 LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS)) |
|
286 # Supply the name of the C runtime lib. |
|
287 LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"' |
|
288 ifneq ($(MSVCP_DLL), ) |
|
289 LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"' |
|
290 endif |
286 else ifneq ($(OPENJDK_TARGET_OS), macosx) |
291 else ifneq ($(OPENJDK_TARGET_OS), macosx) |
287 |
292 |
288 BUILD_LIBJLI_FILES += java_md_common.c |
293 BUILD_LIBJLI_FILES += java_md_common.c |
289 BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c |
294 BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c |
290 |
295 |