135 # Override the default APP_CLASSPATH to pick up sa-jdi.jar also. |
135 # Override the default APP_CLASSPATH to pick up sa-jdi.jar also. |
136 # Default is defined in src/[solaris,windows]/bin/java_md.h |
136 # Default is defined in src/[solaris,windows]/bin/java_md.h |
137 # PROGRAM, JAVA_ARGS, and APP_CLASSPATH are used in src/share/bin/java.c |
137 # PROGRAM, JAVA_ARGS, and APP_CLASSPATH are used in src/share/bin/java.c |
138 # SA is currently not available on windows (for any ARCH), or linux-ia64: |
138 # SA is currently not available on windows (for any ARCH), or linux-ia64: |
139 ifneq ($(ARCH), ia64) |
139 ifneq ($(ARCH), ia64) |
140 JDB_CLASSPATH = "{ \"/lib/tools.jar\", \"/lib/sa-jdi.jar\", \"/classes\" }" |
140 JDB_CLASSPATH = { "/lib/tools.jar", "/lib/sa-jdi.jar", "/classes" } |
141 OTHER_CPPFLAGS += -DAPP_CLASSPATH=$(JDB_CLASSPATH) |
141 OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JDB_CLASSPATH)' |
142 endif |
142 endif |
143 endif |
143 endif |
144 |
144 |
145 # jconsole only |
145 # jconsole only |
146 ifeq ($(PROGRAM),jconsole) |
146 ifeq ($(PROGRAM),jconsole) |
147 JCONSOLE_CLASSPATH = "{ \"/lib/jconsole.jar\", \"/lib/tools.jar\", \"/classes\" }" |
147 JCONSOLE_CLASSPATH = { "/lib/jconsole.jar", "/lib/tools.jar", "/classes" } |
148 OTHER_CPPFLAGS += -DAPP_CLASSPATH=$(JCONSOLE_CLASSPATH) |
148 OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(JCONSOLE_CLASSPATH)' |
149 ifeq ($(PLATFORM), windows) |
149 ifeq ($(PLATFORM), windows) |
150 OTHER_CPPFLAGS += -DJAVAW |
150 OTHER_CPPFLAGS += -DJAVAW |
151 LDLIBS_COMMON += user32.lib |
151 LDLIBS_COMMON += user32.lib |
152 MAIN_JAVA_ARGS += -J-Djconsole.showOutputViewer |
152 MAIN_JAVA_ARGS += -J-Djconsole.showOutputViewer |
153 endif |
153 endif |
161 endif |
161 endif |
162 endif |
162 endif |
163 |
163 |
164 # SA tools need special app classpath |
164 # SA tools need special app classpath |
165 ifeq ($(SA_TOOL),true) |
165 ifeq ($(SA_TOOL),true) |
166 SA_CLASSPATH = "{ \"/lib/tools.jar\", \"/lib/sa-jdi.jar\", \"/classes\"}" |
166 SA_CLASSPATH = { "/lib/tools.jar", "/lib/sa-jdi.jar", "/classes" } |
167 OTHER_CPPFLAGS += -DAPP_CLASSPATH=$(SA_CLASSPATH) |
167 OTHER_CPPFLAGS += -DAPP_CLASSPATH='$(SA_CLASSPATH)' |
168 endif |
168 endif |
169 |
169 |
170 # Wildcards |
170 # Wildcards |
171 ifeq ($(WILDCARDS),true) |
171 ifeq ($(WILDCARDS),true) |
172 OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS |
172 OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS |
173 endif |
173 endif |
174 |
174 |
175 # Always tell native code what the main class is |
175 # Always tell native code what the main class is |
176 OTHER_CPPFLAGS += -DMAIN_CLASS=\"$(MAIN_CLASS)\" |
176 OTHER_CPPFLAGS += -DMAIN_CLASS='"$(MAIN_CLASS)"' |
177 |
177 |
178 # Construct initializer for initial arguments to java |
178 # Construct initializer for initial arguments to java |
179 ALL_ARGS = -J-ms8m $(MAIN_JAVA_ARGS) $(MAIN_CLASS) $(MAIN_ARGS) |
179 ALL_ARGS = -J-ms8m $(MAIN_JAVA_ARGS) $(MAIN_CLASS) $(MAIN_ARGS) |
180 JAVA_ARGS = "{ $(ALL_ARGS:%=\"%\",) }" |
180 JAVA_ARGS = { $(ALL_ARGS:%="%",) } |
181 |
181 |
182 # Always report launcher info |
182 # Always report launcher info |
183 build: launcher_info |
183 build: launcher_info |
184 |
184 |
185 # Print info macro |
185 # Print info macro |