ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed main Makefile 

libfont was renamed to liblcd
This commit is contained in:
bsx 2011-05-22 17:46:25 +02:00
parent e82aca072a
commit 4618351462
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -10,7 +10,7 @@ OBJS +=
OBJS += basic/basic.o OBJS += basic/basic.o
OBJS += eeprom/eeprom.o OBJS += eeprom/eeprom.o
OBJS += reinvoke_isp.o OBJS += reinvoke_isp.o
LIBS += core/libcore.a lcd/libfont.a modules/libmodules.a LIBS += core/libcore.a lcd/liblcd.a modules/libmodules.a
########################################################################## ##########################################################################
# GNU GCC compiler flags # GNU GCC compiler flags
@ -29,7 +29,7 @@ OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o
LDLIBS = -lm LDLIBS = -lm
LDLIBS += -Lmodules -lmodules LDLIBS += -Lmodules -lmodules
LDLIBS += -Lcore -lcore LDLIBS += -Lcore -lcore
LDLIBS += -Llcd -lfont LDLIBS += -Llcd -llcd
OCFLAGS = --strip-unneeded OCFLAGS = --strip-unneeded
LD_PATH = lpc1xxx LD_PATH = lpc1xxx
@ -44,7 +44,7 @@ all: firmware
core/libcore.a: core/projectconfig.h core/libcore.a: core/projectconfig.h
cd core && $(MAKE) ROOT_PATH=../$(ROOT_PATH) cd core && $(MAKE) ROOT_PATH=../$(ROOT_PATH)
lcd/libfont.a lcd/render.o lcd/display.o: lcd/liblcd.a lcd/render.o lcd/display.o:
cd lcd && $(MAKE) ROOT_PATH=../$(ROOT_PATH) cd lcd && $(MAKE) ROOT_PATH=../$(ROOT_PATH)
modules/libmodules.a: modules/libmodules.a:
@ -76,5 +76,5 @@ clean:
@cd modules && $(MAKE) clean @cd modules && $(MAKE) clean
.PHONY: lcd/libfont.a modules/libmodules.a .PHONY: lcd/liblcd.a modules/libmodules.a