Skip to content

Commit 9824f06

Browse files
authored
Merge pull request #71 from soburi/platform_specific_makecommand
Assign platform specific make command
2 parents 5c5ae98 + 5d44ef0 commit 9824f06

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dist/platform_template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"packager": "intiki",
2424
"name": "contiki-makehelper",
25-
"version": "0.0.11"
25+
"version": "0.0.12"
2626
},
2727
{
2828
"packager": "intiki",

platform.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@ compiler.ar.extra_flags=
2828

2929
build.unix.cmds.path={runtime.tools.msys2-contiki-build.path}
3030
build.usr.bin.path={build.unix.cmds.path}/usr/bin
31+
build.make.command=make
32+
build.make.command.windows={build.usr.bin.path}/make
33+
build.make.command.macosx=gmake
3134
build.make.vars=
3235
build.make.goals=all
3336
build.contiki-makehelper.path={runtime.tools.contiki-makehelper.path}
3437
build.contiki-makehelper.verbose=0
3538

3639
contiki-makehelper.cmd-v={build.contiki-makehelper.path}/contiki-makehelper -verbose {build.contiki-makehelper.verbose}
37-
make.paths=-build.usr.bin.path "{build.usr.bin.path}" -build.compiler.path "{build.compiler.path}" -build.system.path "{build.system.path}" -build.variant.path "{build.variant.path}" -build.core.path "{build.core.path}" -build.path "{build.path}" -build.variant {build.variant} -runtime.platform.path {runtime.platform.path} -platform.version {version} -template {build.contiki-makehelper.path}/Makefile.template
40+
make.paths=-build.usr.bin.path "{build.usr.bin.path}" -build.compiler.path "{build.compiler.path}" -build.system.path "{build.system.path}" -build.variant.path "{build.variant.path}" -build.core.path "{build.core.path}" -build.path "{build.path}" -build.variant {build.variant} -runtime.platform.path {runtime.platform.path} -platform.version {version} -make.command {build.make.command} -template {build.contiki-makehelper.path}/Makefile.template
3841
make.args=TARGET={build.variant} {build.make.vars} {build.config_vars}
3942

4043
arduino.defines=-DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch}

0 commit comments

Comments
 (0)