Skip to content

Commit f48913a

Browse files
authored
Merge pull request #76 from soburi/correct_multiplat
Correct build environment - tool path for MacOSX - update makehelper
2 parents 05124d9 + 14f6bb2 commit f48913a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
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.13"
25+
"version": "0.0.14"
2626
},
2727
{
2828
"packager": "intiki",

platform.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ tools.contiki-makehelper.cmd.path.windows={path}\contiki-makehelper.exe
8989
tools.contiki-makehelper.upload.pattern="{cmd.path}" -verbose {build.contiki-makehelper.verbose} -recipe make -build.path "{build.path}" -build.variant {build.variant} -build.usr.bin.path "{build.usr.bin.path}" -build.compiler.path "{build.compiler.path}" -build.uploader.path "{build.uploader.path}" -serial.port {serial.port} TARGET={build.variant} {build.make.vars} {build.config_vars} {build.project_name}.upload
9090
tools.contiki-makehelper.build.unix.cmds.path={runtime.tools.msys2-contiki-build.path}
9191
tools.contiki-makehelper.build.usr.bin.path={build.unix.cmds.path}/usr/bin
92+
tools.contiki-makehelper.build.usr.bin.path.macosx=/usr/local/bin
9293
tools.contiki-makehelper.build.contiki-makehelper.verbose=0
9394

9495

0 commit comments

Comments
 (0)