Subversion Repositories EngineBay2

Rev

Rev 46 | Rev 50 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 46 Rev 48
Line 73... Line 73...
73 
ifdef GCC_PATH
 73 
ifdef GCC_PATH
74 
CC = $(GCC_PATH)/$(PREFIX)gcc
 74 
CC = $(GCC_PATH)/$(PREFIX)gcc
75 
AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
 75 
AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
76 
CP = $(GCC_PATH)/$(PREFIX)objcopy
 76 
CP = $(GCC_PATH)/$(PREFIX)objcopy
77 
SZ = $(GCC_PATH)/$(PREFIX)size
 77 
SZ = $(GCC_PATH)/$(PREFIX)size
- 
 
 78 
## User added
- 
 
 79 
CXX = $(GCC_PATH)/$(PREFIX)g++
78 
else
 80 
else
79 
CC = $(PREFIX)gcc
 81 
CC = $(PREFIX)gcc
80 
AS = $(PREFIX)gcc -x assembler-with-cpp
 82 
AS = $(PREFIX)gcc -x assembler-with-cpp
81 
CP = $(PREFIX)objcopy
 83 
CP = $(PREFIX)objcopy
82 
SZ = $(PREFIX)size
 84 
SZ = $(PREFIX)size
- 
 
 85 
## User added
- 
 
 86 
CXX = $(PREFIX)g++
83 
endif
 87 
endif
84 
HEX = $(CP) -O ihex
 88 
HEX = $(CP) -O ihex
85 
BIN = $(CP) -O binary -S
 89 
BIN = $(CP) -O binary -S
86
90
87 
#######################################
 91 
#######################################
Line 117... Line 121...
117 
-ICore/Inc \
 121 
-ICore/Inc \
118 
-IDrivers/STM32F1xx_HAL_Driver/Inc \
 122 
-IDrivers/STM32F1xx_HAL_Driver/Inc \
119 
-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
 123 
-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
120 
-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
 124 
-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
121 
-IDrivers/CMSIS/Include
 125 
-IDrivers/CMSIS/Include
- 
 
 126 
#############################################
- 
 
 127 
# User added
- 
 
 128 
# C++ sources
- 
 
 129 
CPP_SOURCES +=
122 
 
 130 
 
123 
#######################################################
 131 
#######################################################
124 
# Additional code
 132 
# Additional code
125 
 
 133 
 
126 
C_INCLUDES += -IInc
 134 
C_INCLUDES += -IInc
Line 135... Line 143...
135 
C_DEFS += -DSERIAL_UART1
143 
C_DEFS += -DSERIAL_UART1
136 
 
 144 
 
137 
LIBSERIAL=../libSerial
 145 
LIBSERIAL=../libSerial
138 
include $(LIBSERIAL)/libSerial.mk
 146 
include $(LIBSERIAL)/libSerial.mk
139 
 
 147 
 
- 
 
 148 
# Get the common RPM timing code
- 
 
 149 
LIBIGNTIMING=../libIgnTiming
- 
 
 150 
include $(LIBIGNTIMING)/libIgnTiming.mk
140 
 
 151 
 
141 
# compile gcc flags
 152 
# compile gcc flags
142 
ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
 153 
ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
143 
 
 154 
 
144 
CFLAGS += $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
 155 
CFLAGS += $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
Line 148... Line 159...
148 
endif
 159 
endif
149 
 
 160 
 
150 
 
 161 
 
151 
# Generate dependency information
 162 
# Generate dependency information
152 
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
 163 
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
- 
 
 164 
## User added
- 
 
 165 
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions
153 
 
 166 
 
154 
 
 167 
 
155 
#######################################
 168 
#######################################
156 
# LDFLAGS
 169 
# LDFLAGS
157 
#######################################
 170 
#######################################
Line 174... Line 187...
174 
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
 187 
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
175 
vpath %.c $(sort $(dir $(C_SOURCES)))
 188 
vpath %.c $(sort $(dir $(C_SOURCES)))
176 
# list of ASM program objects
 189 
# list of ASM program objects
177 
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
 190 
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
178 
vpath %.s $(sort $(dir $(ASM_SOURCES)))
 191 
vpath %.s $(sort $(dir $(ASM_SOURCES)))
- 
 
 192 
## User added List of C++ compiled objects
- 
 
 193 
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CPP_SOURCES:.cpp=.o)))
- 
 
 194 
vpath %.cpp $(sort $(dir $(CPP_SOURCES)))
179 
 
 195 
 
- 
 
 196 
## User added C++ compilation rule
- 
 
 197 
$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
- 
 
 198 
	$(CXX) -c $(CXXFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
180 
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
199 
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
181 
	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 200 
	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
182 
 
 201 
 
183 
$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
 202 
$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
184 
	$(AS) -c $(CFLAGS) $< -o $@
 203 
	$(AS) -c $(CFLAGS) $< -o $@