equal
deleted
inserted
replaced
36 # into another dir and copy selectively so debuginfo for java.dll isn't |
36 # into another dir and copy selectively so debuginfo for java.dll isn't |
37 # overwritten. |
37 # overwritten. |
38 $(eval $(call SetupBuildLauncher, java, \ |
38 $(eval $(call SetupBuildLauncher, java, \ |
39 CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
39 CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
40 LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \ |
40 LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \ |
41 LIBS_windows := user32.lib comctl32.lib, \ |
|
42 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
41 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
43 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
42 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
44 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ |
43 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ |
45 OPTIMIZATION := HIGH, \ |
44 OPTIMIZATION := HIGH, \ |
46 )) |
45 )) |
53 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX) |
52 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX) |
54 |
53 |
55 ifeq ($(OPENJDK_TARGET_OS), windows) |
54 ifeq ($(OPENJDK_TARGET_OS), windows) |
56 $(eval $(call SetupBuildLauncher, javaw, \ |
55 $(eval $(call SetupBuildLauncher, javaw, \ |
57 CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
56 CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
58 LIBS_windows := user32.lib comctl32.lib, \ |
|
59 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
57 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
60 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
58 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
61 )) |
59 )) |
62 endif |
60 endif |
63 |
61 |