Move some external files to external/ folder (#744)
It is lot easier to work with automatic formatters if we have external files in different folder. For some tools we can example just exclude external all together. Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
@@ -103,10 +103,10 @@ endif()
|
||||
set(LIBRARY_BACNET_INC "${CMAKE_SOURCE_DIR}/../../src")
|
||||
set(LIBRARY_BACNET_CORE "${CMAKE_SOURCE_DIR}/../../src/bacnet")
|
||||
set(LIBRARY_BACNET_BASIC "${CMAKE_SOURCE_DIR}/../../src/bacnet/basic")
|
||||
set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/STM32F4xx_StdPeriph_Driver/src")
|
||||
set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/STM32F4xx_StdPeriph_Driver/inc")
|
||||
set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/CMSIS")
|
||||
set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/CMSIS/gcc_ride7")
|
||||
set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/external/STM32F4xx_StdPeriph_Driver/src")
|
||||
set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/external/STM32F4xx_StdPeriph_Driver/inc")
|
||||
set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/external/CMSIS")
|
||||
set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/external/CMSIS/gcc_ride7")
|
||||
|
||||
set(BACNET_PROJECT_SOURCE
|
||||
${LIBRARY_STM32_SRC}/stm32f4xx_adc.c
|
||||
@@ -220,8 +220,8 @@ set(BACNET_PROJECT_SOURCE
|
||||
${LIBRARY_BACNET_CORE}/whois.c
|
||||
${LIBRARY_BACNET_CORE}/wp.c
|
||||
|
||||
CMSIS/gcc_ride7/startup_stm32f4xx.s
|
||||
CMSIS/stm32f4xx.h
|
||||
${LIBRARY_CMSIS_GCC_INC}/startup_stm32f4xx.s
|
||||
${LIBRARY_CMSIS_INC}/stm32f4xx.h
|
||||
)
|
||||
|
||||
set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/stm32f4xx.ld)
|
||||
|
||||
@@ -9,9 +9,9 @@ BACNET_CORE := $(BACNET_SRC)/bacnet
|
||||
BACNET_BASIC := $(BACNET_CORE)/basic
|
||||
BACNET_INCLUDE := $(BACNET_SRC)
|
||||
PLATFORM_DIR = .
|
||||
LIBRARY_STM32 = ./STM32F4xx_StdPeriph_Driver/src
|
||||
LIBRARY_STM32_INCLUDES = ./STM32F4xx_StdPeriph_Driver/inc
|
||||
LIBRARY_CMSIS = ./CMSIS
|
||||
LIBRARY_STM32 = ./external/STM32F4xx_StdPeriph_Driver/src
|
||||
LIBRARY_STM32_INCLUDES = ./external/STM32F4xx_StdPeriph_Driver/inc
|
||||
LIBRARY_CMSIS = ./external/CMSIS
|
||||
|
||||
CSTACK_TOOL := $(BACNET_DIR)/tools/avstack/avstack.pl
|
||||
MEMAP_TOOL := $(BACNET_DIR)/tools/memap/memap.py
|
||||
|
||||
+14
-14
@@ -353,9 +353,9 @@
|
||||
<option>
|
||||
<name>CCIncludePath2</name>
|
||||
<state>$PROJ_DIR$</state>
|
||||
<state>$PROJ_DIR$\CMSIS</state>
|
||||
<state>$PROJ_DIR$\CMSIS\iar</state>
|
||||
<state>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\inc</state>
|
||||
<state>$PROJ_DIR$\external\CMSIS</state>
|
||||
<state>$PROJ_DIR$\external\CMSIS\iar</state>
|
||||
<state>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\inc</state>
|
||||
<state>$PROJ_DIR$\..\..\src</state>
|
||||
</option>
|
||||
<option>
|
||||
@@ -1293,40 +1293,40 @@
|
||||
<group>
|
||||
<name>STM32F4-STARTUP</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\CMSIS\iar\startup_stm32f4xx.s</name>
|
||||
<name>$PROJ_DIR$\external\CMSIS\iar\startup_stm32f4xx.s</name>
|
||||
</file>
|
||||
</group>
|
||||
<group>
|
||||
<name>STM32F4XX_LIB</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_adc.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_adc.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_flash.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_flash.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_gpio.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_gpio.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_i2c.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_i2c.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_iwdg.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_iwdg.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_misc.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_misc.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_pwr.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_pwr.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_rcc.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_rcc.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_tim.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_tim.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\STM32F4xx_StdPeriph_Driver\src\stm32f4xx_usart.c</name>
|
||||
<name>$PROJ_DIR$\external\STM32F4xx_StdPeriph_Driver\\src\stm32f4xx_usart.c</name>
|
||||
</file>
|
||||
</group>
|
||||
<file>
|
||||
|
||||
Vendored
Reference in New Issue
Block a user