wirtz
/
esp-link
mirror of https://github.com/jeelabs/esp-link.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix travis #8

Browse Source
pull/193/head
Thorsten von Eicken 8 years ago
parent 0952d0a3c8
commit 0f2c5cac98
2 changed files with 8 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 1
      espfs/mkespfsimage/Makefile

2
Makefile
Unescape View File

@ -254,7 +254,6 @@ SDK_LDDIR = ld
SDK_INCDIR = include include/json SDK_INCDIR = include include/json
SDK_TOOLSDIR = tools SDK_TOOLSDIR = tools
$(warning Hello 1)
# select which tools to use as compiler, librarian and linker # select which tools to use as compiler, librarian and linker
CC := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc CC := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc
AR := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar AR := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar
@ -339,7 +338,6 @@ $1/%.o: %.c
$(vecho) "CC $$<" $(vecho) "CC $$<"
$(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ $(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@
endef endef
$(warning Hello 2)
.PHONY: all checkdirs clean webpages.espfs wiflash .PHONY: all checkdirs clean webpages.espfs wiflash

1
espfs/mkespfsimage/Makefile
Unescape View File

@ -34,6 +34,7 @@ clean:
else else
CC=gcc
CFLAGS=-I.. -std=gnu99 CFLAGS=-I.. -std=gnu99
ifeq ("$(GZIP_COMPRESSION)","yes") ifeq ("$(GZIP_COMPRESSION)","yes")
CFLAGS+= -DESPFS_GZIP CFLAGS+= -DESPFS_GZIP

Write Preview
Loading…
Cancel
Save