- Fixed a compilation problem caused by 2.3 root Makefile-include changes with regard to sdcc.
- Fixed a small typo in cc2430_rf.c - examples/sensinode now compiles
This commit is contained in:
parent
c9954072c9
commit
4a14db6d3a
2 changed files with 65 additions and 63 deletions
|
@ -1,7 +1,3 @@
|
||||||
CONTIKI_CPU_DIRS = . net
|
|
||||||
|
|
||||||
CONTIKI_SOURCEFILES += #mtarch.c rtimer-arch.c elfloader-stub.c watchdog.c
|
|
||||||
|
|
||||||
### Compiler definitions
|
### Compiler definitions
|
||||||
CC = sdcc
|
CC = sdcc
|
||||||
LD = sdcc
|
LD = sdcc
|
||||||
|
@ -36,9 +32,15 @@ CONTIKI_PLATFORM_DIRS = $(PLATFORM_APPDIRS) \
|
||||||
|
|
||||||
### Compilation rules
|
### Compilation rules
|
||||||
|
|
||||||
#CUSTOM_RULE_C_TO_OBJECTDIR_O=1
|
CUSTOM_RULE_C_TO_OBJECTDIR_O=1
|
||||||
CUSTOM_RULE_ALLOBJS_TO_TARGETLIB=1
|
CUSTOM_RULE_ALLOBJS_TO_TARGETLIB=1
|
||||||
|
|
||||||
|
ifdef CUSTOM_RULE_C_TO_OBJECTDIR_O
|
||||||
|
$(OBJECTDIR)/%.o: %.c
|
||||||
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
@$(FINALIZE_DEPENDENCY)
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef CUSTOM_RULE_CS_TO_OBJECTDIR_O
|
ifdef CUSTOM_RULE_CS_TO_OBJECTDIR_O
|
||||||
$(OBJECTDIR)/%.o: %.cS
|
$(OBJECTDIR)/%.o: %.cS
|
||||||
cp $< $(OBJECTDIR)/$*.c
|
cp $< $(OBJECTDIR)/$*.c
|
||||||
|
|
Loading…
Add table
Reference in a new issue