Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
ae6ff1a0
Commit
ae6ff1a0
authored
Jan 10, 2015
by
Peter Magnusson
Browse files
fixes from comments on esptool usage
parent
32ea83c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
ae6ff1a0
...
@@ -29,6 +29,7 @@ ifeq ($(OS),Windows_NT)
...
@@ -29,6 +29,7 @@ ifeq ($(OS),Windows_NT)
CPP
=
xtensa-lx106-elf-cpp
CPP
=
xtensa-lx106-elf-cpp
OBJCOPY
=
xtensa-lx106-elf-objcopy
OBJCOPY
=
xtensa-lx106-elf-objcopy
endif
endif
FIRMWAREDIR
=
..
\\
bin
\\
ESPPORT
=
com1
ESPPORT
=
com1
ifeq
($(PROCESSOR_ARCHITECTURE),AMD64)
ifeq
($(PROCESSOR_ARCHITECTURE),AMD64)
# ->AMD64
# ->AMD64
...
@@ -46,6 +47,7 @@ else
...
@@ -46,6 +47,7 @@ else
NM
=
xtensa-lx106-elf-nm
NM
=
xtensa-lx106-elf-nm
CPP
=
xtensa-lx106-elf-cpp
CPP
=
xtensa-lx106-elf-cpp
OBJCOPY
=
xtensa-lx106-elf-objcopy
OBJCOPY
=
xtensa-lx106-elf-objcopy
FIRMWAREDIR
=
../bin/
UNAME_S
:=
$(
shell
uname
-s
)
UNAME_S
:=
$(
shell
uname
-s
)
ifeq
($(UNAME_S),Linux)
ifeq
($(UNAME_S),Linux)
# LINUX
# LINUX
...
@@ -65,8 +67,8 @@ else
...
@@ -65,8 +67,8 @@ else
endif
endif
endif
endif
#############################################################
#############################################################
ESPTOOL
=
python
../tools/esptool.py
ESPTOOL
=
../tools/esptool.py
FIRMWAREDIR
=
../bin/
CSRCS
?=
$(
wildcard
*
.c
)
CSRCS
?=
$(
wildcard
*
.c
)
ASRCs
?=
$(
wildcard
*
.s
)
ASRCs
?=
$(
wildcard
*
.s
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment