equal
deleted
inserted
replaced
29 |
29 |
30 # On windows, the debuginfo files get the same name as for java.dll. Build |
30 # On windows, the debuginfo files get the same name as for java.dll. Build |
31 # into another dir and copy selectively so debuginfo for java.dll isn't |
31 # into another dir and copy selectively so debuginfo for java.dll isn't |
32 # overwritten. |
32 # overwritten. |
33 $(eval $(call SetupLauncher,java, \ |
33 $(eval $(call SetupLauncher,java, \ |
34 -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ |
34 -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES,,,user32.lib comctl32.lib, \ |
35 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \ |
35 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \ |
36 $(JAVA_VERSION_INFO_RESOURCE), $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs,true)) |
36 $(JAVA_VERSION_INFO_RESOURCE), $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs,true)) |
37 |
37 |
38 $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) |
38 $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) |
39 $(MKDIR) -p $(@D) |
39 $(MKDIR) -p $(@D) |
42 |
42 |
43 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX) |
43 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX) |
44 |
44 |
45 ifeq ($(OPENJDK_TARGET_OS), windows) |
45 ifeq ($(OPENJDK_TARGET_OS), windows) |
46 $(eval $(call SetupLauncher,javaw, \ |
46 $(eval $(call SetupLauncher,javaw, \ |
47 -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \ |
47 -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES,,,user32.lib comctl32.lib, \ |
48 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \ |
48 $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \ |
49 $(JAVA_VERSION_INFO_RESOURCE),,true)) |
49 $(JAVA_VERSION_INFO_RESOURCE),,true)) |
50 endif |
50 endif |
51 |
51 |
52 $(eval $(call SetupLauncher,keytool, \ |
52 $(eval $(call SetupLauncher,keytool, \ |