89 $1_VERSION_INFO_RESOURCE:=$8
90 endif
91
92 $1_LDFLAGS := $3
93 $1_LDFLAGS_SUFFIX :=
94 ifeq ($(OPENJDK_TARGET_OS), macosx)
95 $1_PLIST_FILE:=Info-cmdline.plist
96 ifneq ($(11),)
97 $1_PLIST_FILE:=$(11)
98 ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
99 $1_CODESIGN:=true
100 endif
101 endif
102
103 $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
104 -framework Cocoa -framework Security -framework ApplicationServices \
105 -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
106 $1_LDFLAGS_SUFFIX += -pthread
107 endif
108
109 ifeq ($(USE_EXTERNAL_LIBZ), true)
110 $1_LDFLAGS_SUFFIX += -lz
111 endif
112
113 $1_OUTPUT_DIR_ARG:=$9
114 ifeq (,$$($1_OUTPUT_DIR_ARG))
115 $1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin
116 endif
117
118 # TODO: maybe it's better to move this if-statement out of this function
119 ifeq ($1,java)
120 $1_OPTIMIZATION_ARG:=HIGH
121 $1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
122 else
123 $1_OPTIMIZATION_ARG:=LOW
124 endif
125
126 $1_CFLAGS:=$(CFLAGS_JDKEXE)
127 ifeq ($(10),true)
128 $1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
176 LDFLAGS_SUFFIX_posix:=$4,\
177 LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
178 $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\
179 LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
180 LDFLAGS_SUFFIX_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
181 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\
182 OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\
183 PROGRAM:=$1,\
184 DEBUG_SYMBOLS:=true,\
185 VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\
186 RC_FLAGS:=$(RC_FLAGS)\
187 -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
188 -D "JDK_INTERNAL_NAME=$1" \
189 -D "JDK_FTYPE=0x1L" \
190 $7,\
191 MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
192 CODESIGN:=$$($1_CODESIGN))
193
194 BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
195
196 ifeq ($(OPENJDK_TARGET_OS),macosx)
197 $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
198 endif
199
200 ifeq ($(OPENJDK_TARGET_OS),windows)
201 $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
202 $$($1_WINDOWS_JLI_LIB)
203 endif
204 endef
205
206 ##########################################################################################
207
208 XLIBS:=$(X_LIBS) -lX11
209 ifeq ($(OPENJDK_TARGET_OS),macosx)
210 DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"'
211 XLIBS:=
212 endif
213
214 ifdef OPENJDK
215 JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
216 else
|
89 $1_VERSION_INFO_RESOURCE:=$8
90 endif
91
92 $1_LDFLAGS := $3
93 $1_LDFLAGS_SUFFIX :=
94 ifeq ($(OPENJDK_TARGET_OS), macosx)
95 $1_PLIST_FILE:=Info-cmdline.plist
96 ifneq ($(11),)
97 $1_PLIST_FILE:=$(11)
98 ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
99 $1_CODESIGN:=true
100 endif
101 endif
102
103 $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
104 -framework Cocoa -framework Security -framework ApplicationServices \
105 -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
106 $1_LDFLAGS_SUFFIX += -pthread
107 endif
108
109 ifeq ($(OPENJDK_TARGET_OS), aix)
110 $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static
111 endif
112
113 ifeq ($(USE_EXTERNAL_LIBZ), true)
114 $1_LDFLAGS_SUFFIX += -lz
115 endif
116
117 $1_OUTPUT_DIR_ARG:=$9
118 ifeq (,$$($1_OUTPUT_DIR_ARG))
119 $1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin
120 endif
121
122 # TODO: maybe it's better to move this if-statement out of this function
123 ifeq ($1,java)
124 $1_OPTIMIZATION_ARG:=HIGH
125 $1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
126 else
127 $1_OPTIMIZATION_ARG:=LOW
128 endif
129
130 $1_CFLAGS:=$(CFLAGS_JDKEXE)
131 ifeq ($(10),true)
132 $1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
180 LDFLAGS_SUFFIX_posix:=$4,\
181 LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
182 $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\
183 LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
184 LDFLAGS_SUFFIX_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
185 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\
186 OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\
187 PROGRAM:=$1,\
188 DEBUG_SYMBOLS:=true,\
189 VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\
190 RC_FLAGS:=$(RC_FLAGS)\
191 -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
192 -D "JDK_INTERNAL_NAME=$1" \
193 -D "JDK_FTYPE=0x1L" \
194 $7,\
195 MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
196 CODESIGN:=$$($1_CODESIGN))
197
198 BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
199
200 ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
201 $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
202 endif
203
204 ifeq ($(OPENJDK_TARGET_OS),windows)
205 $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
206 $$($1_WINDOWS_JLI_LIB)
207 endif
208 endef
209
210 ##########################################################################################
211
212 XLIBS:=$(X_LIBS) -lX11
213 ifeq ($(OPENJDK_TARGET_OS),macosx)
214 DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"'
215 XLIBS:=
216 endif
217
218 ifdef OPENJDK
219 JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
220 else
|