Subversion Repositories DashDisplay

Rev

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

Rev 2 Rev 4
Line 94... Line 94...
94 
 
 94 
 
95 
PRJ_OBJ = $(OBJPATH)/PRJ_Obj
 95 
PRJ_OBJ = $(OBJPATH)/PRJ_Obj
96 
INCLUDES += -I$(PRJ_INC)
 96 
INCLUDES += -I$(PRJ_INC)
97 
 
 97 
 
98 
PRJ_OBJECTS  = $(PRJ_OBJ)/main.o
 98 
PRJ_OBJECTS  = $(PRJ_OBJ)/main.o
99 
#PRJ_OBJECTS += $(PRJ_OBJ)/stm32f1xx_hal_msp.o
 - 
 
100 
 
 99 
 
101 
PRJ_OBJECTS += $(PRJ_OBJ)/stm32f1xx_it.o
 100 
PRJ_OBJECTS += $(PRJ_OBJ)/stm32f1xx_it.o
102 
PRJ_OBJECTS += $(PRJ_OBJ)/usb_device.o
 - 
 
103 
PRJ_OBJECTS += $(PRJ_OBJ)/usbd_cdc_if.o
 - 
 
104 
PRJ_OBJECTS += $(PRJ_OBJ)/usbd_conf.o
 - 
 
105 
PRJ_OBJECTS += $(PRJ_OBJ)/usbd_desc.o
 - 
 
106 
PRJ_OBJECTS += $(PRJ_OBJ)/serial.o
 101 
PRJ_OBJECTS += $(PRJ_OBJ)/serial.o
107 
PRJ_OBJECTS += $(PRJ_OBJ)/dials.o
 102 
PRJ_OBJECTS += $(PRJ_OBJ)/dials.o
108 
PRJ_OBJECTS += $(PRJ_OBJ)/switches.o
 103 
PRJ_OBJECTS += $(PRJ_OBJ)/switches.o
109 
PRJ_OBJECTS += $(PRJ_OBJ)/ap_math.o
 104 
PRJ_OBJECTS += $(PRJ_OBJ)/ap_math.o
110 
 
 105 
 
- 
 
 106 
 
111 
C_OBJECTS += $(PRJ_OBJECTS)
 107 
C_OBJECTS += $(PRJ_OBJECTS)
112 
 
 108 
 
113 
 
 109 
 
114 
$(PRJ_OBJ)/%.o: $(PRJ_SRC)/%.c $(DEPENDS)
 110 
$(PRJ_OBJ)/%.o: $(PRJ_SRC)/%.c $(DEPENDS)
115 
	$(CC) $(CFLAGS)   $< -o $@
 111 
	$(CC) $(CFLAGS)   $< -o $@
Line 201... Line 197...
201 
$(DRV_OBJ)/startup_stm32f103xb.o : $(DRV_SRC)/gcc/startup_stm32f103xb.s $(DEPENDS)
 197 
$(DRV_OBJ)/startup_stm32f103xb.o : $(DRV_SRC)/gcc/startup_stm32f103xb.s $(DEPENDS)
202 
	$(AS) $(ASFLAGS)  $< -o $@
 198 
	$(AS) $(ASFLAGS)  $< -o $@
203 
 
 199 
 
204 
ASM_OBJECTS += $(DRV_OBJ)/startup_stm32f103xb.o
 200 
ASM_OBJECTS += $(DRV_OBJ)/startup_stm32f103xb.o
205
201
206 
#############################################
 - 
 
207 
# USB CDC
- 
 
208 
 
 - 
 
209 
 
 - 
 
210 
CDC_PATH  = Middlewares/ST/STM32_USB_Device_Library/Class/CDC
 - 
 
211 
CDC_SRC   = $(CDC_PATH)/Src
 - 
 
212 
CDC_INC   = $(CDC_PATH)/Inc
 - 
 
213 
CDC_OBJ   = $(OBJPATH)/CDC_Obj
 - 
 
214 
INCLUDES += -I$(CDC_INC)
 - 
 
215 
 
 - 
 
216 
#CDC_OBJECTS  = $(CDC_OBJ)/usbd_cdc_if_template.o
 - 
 
217 
CDC_OBJECTS += $(CDC_OBJ)/usbd_cdc.o
 - 
 
218 
 
 - 
 
219 
C_OBJECTS += $(CDC_OBJECTS)
 - 
 
220 
 
 - 
 
221 
$(CDC_OBJ)/%.o: $(CDC_SRC)/%.c $(DEPENDS)
 - 
 
222 
	$(CC) $(CFLAGS)   $< -o $@
 - 
 
223 
 
 - 
 
224 
 
 - 
 
225 
#######################################################
 - 
 
226 
 
 - 
 
227 
USB_CORE = Middlewares/ST/STM32_USB_Device_Library/Core
 - 
 
228 
USB_SRC  = $(USB_CORE)/Src
 - 
 
229 
USB_INC  = $(USB_CORE)/Inc
 - 
 
230 
 
 - 
 
231 
USB_OBJ  = $(OBJPATH)/USB_Obj
 - 
 
232 
INCLUDES += -I$(USB_INC)
 - 
 
233 
 
 - 
 
234 
#USB_OBJECTS  = $(USB_OBJ)/usbd_conf_template.o
 - 
 
235 
USB_OBJECTS += $(USB_OBJ)/usbd_core.o
 - 
 
236 
USB_OBJECTS += $(USB_OBJ)/usbd_ctlreq.o
 - 
 
237 
USB_OBJECTS += $(USB_OBJ)/usbd_ioreq.o
 - 
 
238 
 
 - 
 
239 
C_OBJECTS += $(USB_OBJECTS)
 - 
 
240 
 
 - 
 
241 
 
 - 
 
242 
$(USB_OBJ)/%.o: $(USB_SRC)/%.c $(DEPENDS)
 - 
 
243 
	$(CC) $(CFLAGS)   $< -o $@
 - 
 
244 
 
 202 
 
245 
 
 203 
 
246 
#############################################
 204 
#############################################
247 
# SPI OLED screen
205 
# SPI OLED screen
248 
 
 206 
 
Line 288... Line 246...
288 
 
 246 
 
289 
$(OBJPATH)/.exist:
247 
$(OBJPATH)/.exist:
290 
	mkdir -p $(OBJPATH)
 248 
	mkdir -p $(OBJPATH)
291 
	mkdir -p $(DRV_OBJ)
 249 
	mkdir -p $(DRV_OBJ)
292 
	mkdir -p $(HAL_OBJ)
 250 
	mkdir -p $(HAL_OBJ)
293 
	mkdir -p $(USB_OBJ)
 - 
 
294 
	mkdir -p $(CDC_OBJ)
 - 
 
295 
	mkdir -p $(PRJ_OBJ)
 251 
	mkdir -p $(PRJ_OBJ)
296 
	mkdir -p $(OLED_OBJ)
 252 
	mkdir -p $(OLED_OBJ)
297 
	mkdir -p $(PLX_OBJ)
 253 
	mkdir -p $(PLX_OBJ)
298 
	touch $@
 254 
	touch $@
299 
 
 255 
 
300 
 
 256 
 
301 
-include $(HAL_OBJECTS:.o=.d)
 257 
-include $(HAL_OBJECTS:.o=.d)
302 
-include $(DRV_OBJECTS:.o=.d)
 258 
-include $(DRV_OBJECTS:.o=.d)
303 
-include $(CDC_OBJECTS:.o=.d)
 - 
 
304 
-include $(USB_OBJECTS:.o=.d)
 - 
 
305 
-include $(PRJ_OBJECTS:.o=.d)
 259 
-include $(PRJ_OBJECTS:.o=.d)
306 
-include $(OLED_OBJECTS:.o=.d)
 260 
-include $(OLED_OBJECTS:.o=.d)
307 
-include $(PLX_OBJECTS:.o=.d)
 261 
-include $(PLX_OBJECTS:.o=.d)
308 
 
 262 
 
309 
 
 263 
 
Line 319... Line 273...
319 
 
 273 
 
320 
#common clean rule
 274 
#common clean rule
321 
clean-base:
 275 
clean-base:
322 
	rm -f $(DRV_OBJ)/*
 276 
	rm -f $(DRV_OBJ)/*
323 
	rm -f $(HAL_OBJ)/*
 277 
	rm -f $(HAL_OBJ)/*
324 
	rm -f $(USB_OBJ)/*
 - 
 
325 
	rm -f $(CDC_OBJ)/*
 - 
 
326 
	rm -f $(PRJ_OBJ)/*
 278 
	rm -f $(PRJ_OBJ)/*
327 
	rm -f $(OLED_OBJ)/*
 279 
	rm -f $(OLED_OBJ)/*
328 
	rm -f $(PLX_OBJ)/*
 280 
	rm -f $(PLX_OBJ)/*
329 
 
 281 
 
330 
#Macro expansion in the makefile change the paths used
 282 
#Macro expansion in the makefile change the paths used