25 |
25 |
26 include LauncherCommon.gmk |
26 include LauncherCommon.gmk |
27 |
27 |
28 $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk)) |
28 $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk)) |
29 |
29 |
30 JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/common |
30 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common |
31 JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/launcher/icons |
31 JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons |
32 |
32 |
33 ################################################################################ |
33 ################################################################################ |
34 |
34 |
35 # On windows, the debuginfo files get the same name as for java.dll. Build |
35 # On windows, the debuginfo files get the same name as for java.dll. Build |
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, \ |
41 LIBS_windows := user32.lib comctl32.lib, \ |
42 RC_FLAGS := $(JAVA_RC_FLAGS), \ |
42 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
43 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
43 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
44 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ |
44 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \ |
45 OPTIMIZATION := HIGH, \ |
45 OPTIMIZATION := HIGH, \ |
46 WINDOWS_STATIC_LINK := true, \ |
46 WINDOWS_STATIC_LINK := true, \ |
47 NO_JAVA_MS := true, \ |
47 NO_JAVA_MS := true, \ |
56 |
56 |
57 ifeq ($(OPENJDK_TARGET_OS), windows) |
57 ifeq ($(OPENJDK_TARGET_OS), windows) |
58 $(eval $(call SetupBuildLauncher, javaw, \ |
58 $(eval $(call SetupBuildLauncher, javaw, \ |
59 CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
59 CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \ |
60 LIBS_windows := user32.lib comctl32.lib, \ |
60 LIBS_windows := user32.lib comctl32.lib, \ |
61 RC_FLAGS := $(JAVA_RC_FLAGS), \ |
61 EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \ |
62 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
62 VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \ |
63 WINDOWS_STATIC_LINK := true, \ |
63 WINDOWS_STATIC_LINK := true, \ |
64 NO_JAVA_MS := true, \ |
64 NO_JAVA_MS := true, \ |
65 )) |
65 )) |
66 endif |
66 endif |
70 )) |
70 )) |
71 |
71 |
72 ################################################################################ |
72 ################################################################################ |
73 |
73 |
74 ifeq ($(OPENJDK_TARGET_OS), linux) |
74 ifeq ($(OPENJDK_TARGET_OS), linux) |
75 $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \ |
75 $(eval $(call SetupJdkExecutable, BUILD_JEXEC, \ |
76 NAME := jexec, \ |
76 NAME := jexec, \ |
77 TYPE := EXECUTABLE, \ |
|
78 SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \ |
77 SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \ |
79 INCLUDE_FILES := jexec.c, \ |
78 INCLUDE_FILES := jexec.c, \ |
80 OPTIMIZATION := LOW, \ |
79 OPTIMIZATION := LOW, \ |
81 CFLAGS := $(CFLAGS_JDKEXE) \ |
80 CFLAGS := $(CFLAGS_JDKEXE) \ |
82 -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \ |
81 -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \ |
83 CFLAGS_linux := -fPIC, \ |
82 CFLAGS_linux := -fPIC, \ |
84 CFLAGS_solaris := -KPIC, \ |
83 CFLAGS_solaris := -KPIC, \ |
85 LDFLAGS := $(LDFLAGS_JDKEXE), \ |
84 LDFLAGS := $(LDFLAGS_JDKEXE), \ |
86 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \ |
|
87 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ |
85 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ |
88 )) |
86 )) |
89 |
87 |
90 TARGETS += $(BUILD_JEXEC) |
88 TARGETS += $(BUILD_JEXEC) |
91 endif |
89 endif |
92 |
90 |
93 ################################################################################ |
91 ################################################################################ |
94 |
92 |
95 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) |
93 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) |
96 $(eval $(call SetupNativeCompilation, BUILD_JSPAWNHELPER, \ |
94 $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \ |
97 NAME := jspawnhelper, \ |
95 NAME := jspawnhelper, \ |
98 TYPE := EXECUTABLE, \ |
|
99 SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \ |
96 SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \ |
100 OPTIMIZATION := LOW, \ |
97 OPTIMIZATION := LOW, \ |
101 CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \ |
98 CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \ |
102 EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \ |
99 EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \ |
103 LDFLAGS := $(LDFLAGS_JDKEXE), \ |
100 LDFLAGS := $(LDFLAGS_JDKEXE), \ |
104 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \ |
|
105 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ |
101 OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ |
106 )) |
102 )) |
107 |
103 |
108 TARGETS += $(BUILD_JSPAWNHELPER) |
104 TARGETS += $(BUILD_JSPAWNHELPER) |
109 endif |
105 endif |