[ion] Clean the shared folder

Change-Id: I165135ec1600795266a331ee740e608be16c7933
This commit is contained in:
Romain Goyet
2017-02-16 10:23:49 +01:00
parent 1da13c5b91
commit 9b6b341c62
7 changed files with 9 additions and 18 deletions

View File

@@ -1,8 +1,10 @@
SFLAGS += -Iion/include -DKD_CONFIG_H=1
include ion/src/$(PLATFORM)/Makefile
objs += $(addprefix ion/src/, \
objs += $(addprefix ion/src/shared/, \
c.o \
events.o \
events_$(ION_EVENTS).o \
)
tests += $(addprefix ion/test/,\

View File

@@ -2,15 +2,10 @@ objs += $(addprefix ion/src/blackbox/, boot.o ion.o)
objs += $(addprefix ion/src/shared/, \
crc32.o \
events.o \
events_from_keyboard.o \
log.o \
log_printf.o \
power.o \
)
ion/src/shared/log.o: SFLAGS=-Iion/include
#objs += $(addprefix ion/src/simulator/boot/, main.o)
#objs += $(addprefix ion/src/simulator/display/, fltklcd.o)
#objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
#SFLAGS += -I/usr/local/Cellar/fltk/1.3.3/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_THREAD_SAFE -D_REENTRANT
#LDFLAGS += -L/usr/local/Cellar/fltk/1.3.3/lib -lfltk -lpthread -framework Cocoa
ion/src/shared/log_printf.o: SFLAGS=-Iion/include
ion/src/shared/events_stdin.o: SFLAGS=-Iion/include
ion/src/shared/random.o: SFLAGS=-Iion/include

View File

@@ -12,11 +12,6 @@ objs += $(addprefix ion/src/device/, \
sd_card.o\
)
objs += $(addprefix ion/src/shared/, \
events.o \
events_from_keyboard.o \
)
# When using the register.h C++ file in production mode, we expect the compiler
# to completely inline all bit manipulations. For some reason, if we build using
# the -Os optimization flag, GCC doesn't inline everything and and ends up

View File

@@ -2,15 +2,14 @@ objs += $(addprefix ion/src/simulator/, \
battery.o\
init.o\
)
objs += $(addprefix ion/src/simulator/boot/, main.o)
objs += $(addprefix ion/src/simulator/display/, fltklcd.o)
objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
objs += $(addprefix ion/src/shared/, \
crc32.o \
events.o \
events_from_keyboard.o \
log.o \
log_printf.o \
power.o \
)