Commit 36316c2e authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Support C targets

parent 6f416f19

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ COMMON_FLAGS = -g -Os -Wall -Wextra -fno-rtti -fno-threadsafe-statics 
CFLAGS = -std=c99

CXXFLAGS = -std=c++14



C_TARGETS =

CXX_TARGETS = src/app/${app}/main.cc src/os/object/cpp_helpers.cc src/os/object/outputstream.cc



QUIET = @

src/arch/arduino-nano-168/Makefile.inc

+4 −1
Original line number Diff line number Diff line
@@ -64,11 +64,14 @@ endif 


COMMON_FLAGS += -DBAUD=${uart_baud}UL



OBJECTS = ${CXX_TARGETS:.cc=.o}

OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o}



.cc.o:

	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}



.c.o:

	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c}



build/system.elf: ${OBJECTS}

	${QUIET}${CXX} ${COMMON_FLAGS} ${CXXFLAGS} -Wl,--gc-sections -o $@ ${OBJECTS}

	${QUIET}avr-size --format=avr --mcu=${MCU} $@

src/arch/arduino-nano/Makefile.inc

+4 −1
Original line number Diff line number Diff line
@@ -45,11 +45,14 @@ else 
	COMMON_FLAGS += -DF_CPU=16000000UL

endif



OBJECTS = ${CXX_TARGETS:.cc=.o}

OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o}



.cc.o:

	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}



.c.o:

	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c}



build/system.elf: ${OBJECTS}

	${QUIET}${CXX} ${COMMON_FLAGS} ${CXXFLAGS} -Wl,--gc-sections -o $@ ${OBJECTS}

	${QUIET}avr-size --format=avr --mcu=${MCU} $@

src/arch/blinkenrocket/Makefile.inc

+5 −2
Original line number Diff line number Diff line
@@ -27,10 +27,13 @@ else ifneq ($(findstring i2c,${arch_drivers}), ) 
	CXX_TARGETS += src/arch/blinkenrocket/driver/i2c.cc

endif



OBJECTS = ${CXX_TARGETS:.cc=.o}

OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o}



.cc.o:

	${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}



.cc.o:

	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c}



build/system.elf: ${OBJECTS}

	${CXX} ${COMMON_FLAGS} ${CXXFLAGS} -Wl,--gc-sections -o $@ ${OBJECTS}

src/arch/esp8266/Makefile.inc

+7 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LDFLAGS += -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static 
CXX_TARGETS += src/arch/esp8266/arch.cc src/arch/esp8266/driver/gpio.cc

CXX_TARGETS += src/arch/esp8266/driver/stdout.cc src/arch/esp8266/driver/uptime.cc



OBJECTS = ${CXX_TARGETS:.cc=.o}

OBJECTS = ${CXX_TARGETS:.cc=.o} ${C_TARGETS:.c=.o}



ifeq (${esp8266_led2}, 1)

	COMMON_FLAGS += -DLED_ON_GPIO16
@@ -34,8 +34,12 @@ ifneq ($(findstring stdin,${arch_drivers}), ) 
endif



.cc.o:

	${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

	${OBJCOPY} --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal $@

	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

	${QUIET}${OBJCOPY} --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal $@



.c.o:

	${QUIET}${CC} ${INCLUDES} ${COMMON_FLAGS} ${CFLAGS} -c -o $@ ${@:.o=.c}

	${QUIET}${OBJCOPY} --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal $@



build/system.ar: ${OBJECTS}

	${AR} cru $@ ${OBJECTS}