Skip to content

Commit

Permalink
Merge pull request #71 from soburi/platform_specific_makecommand
Browse files Browse the repository at this point in the history
Assign platform specific make command
  • Loading branch information
soburi authored Jun 10, 2018
2 parents 5c5ae98 + 5d44ef0 commit 9824f06
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dist/platform_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{
"packager": "intiki",
"name": "contiki-makehelper",
"version": "0.0.11"
"version": "0.0.12"
},
{
"packager": "intiki",
Expand Down
5 changes: 4 additions & 1 deletion platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ compiler.ar.extra_flags=

build.unix.cmds.path={runtime.tools.msys2-contiki-build.path}
build.usr.bin.path={build.unix.cmds.path}/usr/bin
build.make.command=make
build.make.command.windows={build.usr.bin.path}/make
build.make.command.macosx=gmake
build.make.vars=
build.make.goals=all
build.contiki-makehelper.path={runtime.tools.contiki-makehelper.path}
build.contiki-makehelper.verbose=0

contiki-makehelper.cmd-v={build.contiki-makehelper.path}/contiki-makehelper -verbose {build.contiki-makehelper.verbose}
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
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
make.args=TARGET={build.variant} {build.make.vars} {build.config_vars}

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

0 comments on commit 9824f06

Please sign in to comment.