Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-18 03:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #553 from oliverschmidt/master

Browse Source 
Some fine tuning after the recent general modularization.
This commit is contained in:
Oliver Schmidt 2014-02-02 11:14:17 -08:00
commit 9a44bafb16
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpu/6502/Makefile.6502
View File

@ -37,6 +37,8 @@ endif
all: cs8900a.eth lan91c96.eth w5100.eth all: cs8900a.eth lan91c96.eth w5100.eth
.SUFFIXES:
CONTIKI_TARGET_DIRS = . lib sys CONTIKI_TARGET_DIRS = . lib sys
CONTIKI_CPU_DIRS = . lib sys ctk net CONTIKI_CPU_DIRS = . lib sys ctk net
@ -48,13 +50,13 @@ CONTIKI_CPU_SOURCEFILES += log.c error.c unload.c config.c ctk-mouse.c \
CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \ CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \
$(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES) $(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES)
MODULES += core/ctk core/net/ip core/net/ipv4 core/net/ipv6
ifdef ETHERNET ifdef ETHERNET
CONTIKI_SOURCEFILES += $(ETHERNET)-eth.S CONTIKI_SOURCEFILES += $(ETHERNET)-eth.S
CFLAGS += -DETHERNET=$(ETHERNET) CFLAGS += -DETHERNET=$(ETHERNET)
endif endif
### Compiler definitions
AS = ca65 AS = ca65
CC = cl65 CC = cl65
LD = ld65 LD = ld65
@ -64,9 +66,6 @@ AR = ar65
# The apps coming with Contiki run even on a 0x100 byte stack. # The apps coming with Contiki run even on a 0x100 byte stack.
ASFLAGS = -t $(TARGET) ASFLAGS = -t $(TARGET)
CFLAGS += -t $(TARGET) -Or -W -unused-param,-unused-var,-const-comparison CFLAGS += -t $(TARGET) -Or -W -unused-param
LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200 LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200
AROPTS = a AROPTS = a
## Default modules
MODULES += core/net/ipv4 core/ctk core/net core/net/ip

4
cpu/6502/Makefile.customrules-6502
View File

@ -1,7 +1,3 @@
### Compilation rules
.SUFFIXES:
CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
$(OBJECTDIR)/%.o: %.c | $(OBJECTDIR) $(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
$(TRACE_CC) $(TRACE_CC)