5afcbf6fff
Setting UIP_CONF_IPV6 to zero from the make build command line is something that seems like it should ensure that IPv6 is disabled, but in fact it actually *enables* IPv6. This seems counter intuitive, so this patch changes the behavior of the makefiles to handle this case properly.
37 lines
1.2 KiB
Text
37 lines
1.2 KiB
Text
ifndef CONTIKI
|
|
$(error CONTIKI not defined! You must specify where CONTIKI resides!)
|
|
endif
|
|
|
|
ifdef SEEDEYE_ID
|
|
CFLAGS += -DSEEDEYE_ID=${SEEDEYE_ID}
|
|
endif
|
|
|
|
ifeq ($(UIP_CONF_IPV6),1)
|
|
CFLAGS += -DWITH_UIP6=1
|
|
endif
|
|
|
|
CONTIKI_TARGET_DIRS = . dev dev/mrf24j40 apps net
|
|
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
|
|
|
|
CONTIKI_PLAT_DEFS += -D __USE_TIMER__
|
|
CONTIKI_PLAT_DEFS += -D __USE_TIMER_1__
|
|
CONTIKI_PLAT_DEFS += -D __USE_TIMER_23__
|
|
CONTIKI_PLAT_DEFS += -D __USE_UART__
|
|
CONTIKI_PLAT_DEFS += -D __USE_UART_PORT1A__
|
|
CONTIKI_PLAT_DEFS += -D __USE_UART_PORT1B__
|
|
CONTIKI_PLAT_DEFS += -D __USE_SPI__
|
|
CONTIKI_PLAT_DEFS += -D __USE_SPI_PORT3A__
|
|
CONTIKI_PLAT_DEFS += -D __USE_MRF24J40_SPI_PORT_3A__
|
|
CONTIKI_PLAT_DEFS += -D __USE_UART_PORT1A_FOR_SLIP__
|
|
CONTIKI_PLAT_DEFS += -D __USE_UART_PORT1B_FOR_DEBUG__
|
|
CONTIKI_PLAT_DEFS += -D MRF24J40MB -D ADD_RSSI_AND_LQI_TO_PACKET
|
|
|
|
CONTIKI_CORE_SOURCEFILES = leds.c sensors.c slip.c
|
|
|
|
CONTIKI_TARGET_SOURCEFILES += contiki-seedeye-main.c init-net.c leds-arch.c battery-sensor.c button-sensor.c radio-sensor.c
|
|
CONTIKI_TARGET_SOURCEFILES += mrf24j40.c
|
|
CONTIKI_TARGET_SOURCEFILES += $(CONTIKI_CORE_SOURCEFILES)
|
|
|
|
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
|
|
|
include $(CONTIKI)/cpu/pic32/Makefile.pic32
|