porting: Fix Tinycrypt port build

Tinycrypt requires -std=c99 flag to build.
This commit is contained in:
Michał Narajowski
2018-11-05 10:57:54 +01:00
parent bb650cc692
commit 3358930f36
3 changed files with 18 additions and 4 deletions
+7 -1
View File
@@ -39,14 +39,18 @@ SRC = \
$(NIMBLE_ROOT)/porting/npl/dummy/src/npl_os_dummy.c \
$(NIMBLE_ROOT)/porting/npl/dummy/src/hci_dummy.c \
$(NIMBLE_SRC) \
$(TINYCRYPT_SRC) \
main.c \
# Add dummy NPL and all NimBLE directories to include paths
INC = \
$(NIMBLE_ROOT)/porting/npl/dummy/include \
$(NIMBLE_INCLUDE) \
$(TINYCRYPT_INCLUDE) \
$(INCLUDE) \
OBJ := $(SRC:.c=.o)
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
CFLAGS := $(NIMBLE_CFLAGS)
@@ -59,8 +63,10 @@ clean:
rm $(OBJ) -f
rm dummy -f
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
%.o: %.c
$(CC) -c $(addprefix -I, $(INC)) $(CFLAGS) -o $@ $<
dummy: $(OBJ)
dummy: $(OBJ) $(TINYCRYPT_OBJ)
$(CC) -o $@ $^
+7 -1
View File
@@ -27,6 +27,7 @@ SRC += \
$(NIMBLE_ROOT)/porting/npl/linux/src/os_task.c \
$(NIMBLE_ROOT)/porting/npl/linux/src/os_time.c \
$(NIMBLE_ROOT)/nimble/transport/socket/src/ble_hci_socket.c \
$(TINYCRYPT_SRC) \
$(NULL)
# Source files for demo app
@@ -42,6 +43,7 @@ INC = \
$(NIMBLE_ROOT)/porting/npl/linux/src \
$(NIMBLE_ROOT)/nimble/transport/socket/include \
$(NIMBLE_INCLUDE) \
$(TINYCRYPT_INCLUDE) \
$(NULL)
INCLUDES := $(addprefix -I, $(INC))
@@ -52,6 +54,8 @@ SRC_CC = $(filter %.cc, $(SRC))
OBJ := $(SRC_C:.c=.o)
OBJ += $(SRC_CC:.cc=.o)
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
CFLAGS = \
$(NIMBLE_CFLAGS) \
$(INCLUDES) \
@@ -70,12 +74,14 @@ clean:
rm $(OBJ) -f
rm dummy -f
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
%.o: %.c
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
%.o: %.cc
$(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $<
nimble-linux: $(OBJ)
nimble-linux: $(OBJ) $(TINYCRYPT_OBJ)
$(LD) -o $@ $^ $(LIBS)
$(SIZE) $@
+4 -2
View File
@@ -15,10 +15,12 @@
# under the License.
#
NIMBLE_INCLUDE += \
TINYCRYPT_CFLAGS := -std=c99
TINYCRYPT_INCLUDE := \
$(NIMBLE_ROOT)/ext/tinycrypt/include \
NIMBLE_SRC += \
TINYCRYPT_SRC := \
$(NIMBLE_ROOT)/ext/tinycrypt/src/aes_decrypt.c \
$(NIMBLE_ROOT)/ext/tinycrypt/src/aes_encrypt.c \
$(NIMBLE_ROOT)/ext/tinycrypt/src/cmac_mode.c \