Merge with latest 2.3
This commit is contained in:
@@ -381,9 +381,12 @@ endif()
|
||||
|
||||
add_definitions(-DPOPUP_LEVEL=${POPUP_LEVEL})
|
||||
|
||||
if(BOOTLOADER)
|
||||
add_definitions(-DBOOTLOADER)
|
||||
endif(BOOTLOADER)
|
||||
if(INTERNAL_MODULE_MULTI)
|
||||
set(DEFAULT_TEMPLATE_SETUP 21 CACHE STRING "")
|
||||
else()
|
||||
set(DEFAULT_TEMPLATE_SETUP 0 CACHE STRING "")
|
||||
endif()
|
||||
add_definitions(-DDEFAULT_TEMPLATE_SETUP=${DEFAULT_TEMPLATE_SETUP})
|
||||
|
||||
set(SRC
|
||||
${SRC}
|
||||
@@ -444,7 +447,6 @@ endif()
|
||||
|
||||
set(SRC ${SRC} ${FIRMWARE_SRC})
|
||||
|
||||
|
||||
##### firmware target #####
|
||||
|
||||
option(FIRMWARE_TARGET "Configure Firmware target (can be turned of for compiling Companion only)" ON)
|
||||
|
||||
Reference in New Issue
Block a user