Bad merge!
This commit is contained in:
@@ -91,7 +91,11 @@ endif()
|
|||||||
add_definitions(-DPCBREV=${PCBREV})
|
add_definitions(-DPCBREV=${PCBREV})
|
||||||
add_definitions(-DPCBREV_${PCBREV})
|
add_definitions(-DPCBREV_${PCBREV})
|
||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})
|
set(FIRMWARE_DEPENDENCIES
|
||||||
|
${FIRMWARE_DEPENDENCIES}
|
||||||
|
${BITMAPS_TARGET}
|
||||||
|
datacopy
|
||||||
|
)
|
||||||
|
|
||||||
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD)
|
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD)
|
||||||
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
||||||
|
|||||||
Reference in New Issue
Block a user