equal
deleted
inserted
replaced
64 # |
64 # |
65 # Remaining parameters are named arguments. These include: |
65 # Remaining parameters are named arguments. These include: |
66 # MAIN_MODULE The module of the main class to launch if different from the |
66 # MAIN_MODULE The module of the main class to launch if different from the |
67 # current module |
67 # current module |
68 # MAIN_CLASS The Java main class to launch |
68 # MAIN_CLASS The Java main class to launch |
69 # JAVA_ARGS Processed into a -DJAVA_ARGS C flag |
69 # JAVA_ARGS Processed into a -DJAVA_ARGS and added to CFLAGS |
|
70 # EXTRA_JAVA_ARGS Processed into a -DEXTRA_JAVA_ARGS and is prepended |
|
71 # before JAVA_ARGS to CFLAGS, primarily to allow long string literal |
|
72 # compile time defines exceeding Visual Studio 2013 limitations. |
70 # CFLAGS Additional CFLAGS |
73 # CFLAGS Additional CFLAGS |
71 # CFLAGS_windows Additional CFLAGS_windows |
74 # CFLAGS_windows Additional CFLAGS_windows |
72 # LIBS_unix Additional LIBS_unix |
75 # LIBS_unix Additional LIBS_unix |
73 # LIBS_windows Additional LIBS_windows |
76 # LIBS_windows Additional LIBS_windows |
74 # LDFLAGS_solaris Additional LDFLAGS_solaris |
77 # LDFLAGS_solaris Additional LDFLAGS_solaris |
102 ifeq ($$($1_MAIN_MODULE), ) |
105 ifeq ($$($1_MAIN_MODULE), ) |
103 $1_MAIN_MODULE := $(MODULE) |
106 $1_MAIN_MODULE := $(MODULE) |
104 endif |
107 endif |
105 |
108 |
106 ifneq ($$($1_JAVA_ARGS), ) |
109 ifneq ($$($1_JAVA_ARGS), ) |
|
110 ifneq ($$($1_EXTRA_JAVA_ARGS), ) |
|
111 $1_EXTRA_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \ |
|
112 $$(addprefix -J, $$($1_EXTRA_JAVA_ARGS)), "$$a"$(COMMA) )) }' |
|
113 $1_CFLAGS += -DEXTRA_JAVA_ARGS=$$($1_EXTRA_JAVA_ARGS_STR) |
|
114 endif |
107 $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \ |
115 $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \ |
108 $$(addprefix -J, $$($1_JAVA_ARGS)) -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS), "$$a"$(COMMA) )) }' |
116 $$(addprefix -J, $$($1_JAVA_ARGS)) -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS), "$$a"$(COMMA) )) }' |
109 $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR) |
117 $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR) |
110 endif |
118 endif |
111 |
119 |