r2maeh2/engine_control
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os lib naming unified

Browse Source
This commit is contained in:
tkl 2016-07-29 08:51:56 +02:00
parent 7414c6a3e2
commit 9e946aeefb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/make/rules.mk
View File

@ -11,7 +11,9 @@ endif
INCLUDES += $(SRC_DIR)/os/$(DBG_REL_DIR)/include INCLUDES += $(SRC_DIR)/os/$(DBG_REL_DIR)/include
LIB_DIR += $(SRC_DIR)/os/$(DBG_REL_DIR) LIB_DIR += $(SRC_DIR)/os/$(DBG_REL_DIR)
LIBS += kosmos-arm-stm32f4-discovery-dbg
OS_LIB = kosmos-$(ARCH)-$(BOARD)$(DBG_EXT)
LIBS += $(OS_LIB)
CFLAGS += \ CFLAGS += \
-O$(OPTIM) \ -O$(OPTIM) \
@ -28,11 +30,9 @@ CPPCHECK_FLAGS += \
include $(ROOT_DIR)/config/make/tools.mk include $(ROOT_DIR)/config/make/tools.mk
SRC_DIR = $(ROOT_DIR)/source SRC_DIR = $(ROOT_DIR)/source
DBG_REL_DIR = release
ifeq ($(DEBUG),y) ifeq ($(DEBUG),y)
DBG_REL_DIR = debug DBG_REL_DIR = debug
else
DBG_REL_DIR = release
endif endif
OBJ_DIR = $(ROOT_DIR)/release/object/$(ARCH)/$(DBG_REL_DIR) OBJ_DIR = $(ROOT_DIR)/release/object/$(ARCH)/$(DBG_REL_DIR)
@ -48,6 +48,7 @@ DOC_SRC :=
ELF_EXT = .elf ELF_EXT = .elf
BIN_EXT = .bin BIN_EXT = .bin
HEX_EXT = .hex HEX_EXT = .hex
LIB_EXT = .a
SIZE_EXT = .size SIZE_EXT = .size
TEST_EXT = TEST_EXT =

5
config/make/stm32f4xx.mk
View File

@ -1,4 +1,5 @@
ARCH ?= stm32f4xx ARCH ?= arm
CPU ?= stm32f4xx
ifeq ($(ARCH),stm32f4xx) ifeq ($(ARCH),stm32f4xx)
CFLAGS += -DARCH_STM32F4XX CFLAGS += -DARCH_STM32F4XX
endif endif
@ -14,9 +15,11 @@ INCLUDES += \
ifeq ($(DEBUG),y) ifeq ($(DEBUG),y)
OPTIM = 0 OPTIM = 0
CFLAGS += -g CFLAGS += -g
DBG_EXT = -dbg
else else
OPTIM = s OPTIM = s
LDFLAGS += -s LDFLAGS += -s
DBG_EXT =
endif endif
CFLAGS += \ CFLAGS += \