muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefile working; doesn't compile yet

partial-rewrite
Ben Blazak 2013-04-18 19:55:24 -07:00
parent a12a83b555
commit f47ab1315e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/keyboard/ergodox/options.mk
View File

@ -56,5 +56,5 @@ SCR += $(wildcard $(CURDIR)/*.c)
SRC += $(wildcard $(CURDIR)/controller/*.c)
SRC += $(wildcard $(CURDIR)/layout/$(KEYBOARD_LAYOUT)*.c)
CFLAGS += -include $(wildcard $(CURDIR)/options.h)
CFLAGS += -include '$(wildcard $(CURDIR)/options.h)'

2
firmware/lib/twi/options.mk
View File

@ -11,5 +11,5 @@
#
SRC += $(CURDIR)/$(MCU).c
SRC += $(wildcard $(CURDIR)/$(MCU).c)

6
firmware/makefile
View File

@ -39,12 +39,12 @@ include $(CURDIR)/options.mk
# -------
CURDIR := $(OLD_CURDIR)
SRC += $(CURDIR)/main.c
SRC += $(wildcard $(CURDIR)/main.c)
# (other source files included through the makefile included above)
# -----------------------------------------------------------------------------
CFLAGS := -mmcu=$(MCU) # processor type; must match real life
CFLAGS += -mmcu=$(MCU) # processor type; must match real life
CFLAGS += -DF_CPU=$(F_CPU) # processor frequency; must match initialization
# in source
# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@ -133,7 +133,7 @@ clean:
--no-change-warnings \
'$<' '$@' || exit 0
%.elf: $(OBJ)
$(TARGET).elf: $(OBJ)
@echo
@echo '--- making $@ ---'
$(CC) $(strip $(CFLAGS)) $(strip $(LDFLAGS)) '$^' --output '$@'