Compilation fix

This commit is contained in:
Bertrand Songis
2020-01-09 10:59:20 +01:00
parent 0626b31dfe
commit 40e994dca3
3 changed files with 8 additions and 4 deletions
+4
View File
@@ -1,5 +1,9 @@
set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
set_property(CACHE FONT PROPERTY STRINGS "STD" "SQT5")
string(TOLOWER "${FONT}" FONT_DIR)
set(STICKS_ARGS --rows 4)
add_bitmaps_target(9x_xbm_1bit ${RADIO_SRC_DIR}/bitmaps/sticks.xbm 1bit "${STICKS_ARGS}") # 1bit format, 1byte size, split into 4 rows
add_bitmaps_target(9x_bitmaps ${RADIO_SRC_DIR}/bitmaps/128x64/*.png 1bit "") # 1bit format, 1byte size, 1 row
add_fonts_target(9x_fonts_1bit ${RADIO_SRC_DIR}/fonts/${FONT_DIR}/*.png)
+4
View File
@@ -1,5 +1,9 @@
set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
set_property(CACHE FONT PROPERTY STRINGS "STD" "SQT5")
string(TOLOWER "${FONT}" FONT_DIR)
set(STICKS_ARGS --rows 4)
add_bitmaps_target(taranis_xbm ${RADIO_SRC_DIR}/bitmaps/sticks.xbm 1bit "${STICKS_ARGS}") # 1bit format, 1byte size, split into 4 rows
add_fonts_target(taranis_fonts ${RADIO_SRC_DIR}/fonts/${FONT_DIR}/*.png)
add_bitmaps_target(taranis_bitmaps ${RADIO_SRC_DIR}/bitmaps/212x64/*.png 4bits "")
@@ -1,6 +1,3 @@
set(FONT "STD" CACHE STRING "Choose font : STD or SQT5")
set_property(CACHE FONT PROPERTY STRINGS SQT5)
add_definitions(-DGRAPHICS)
set(GUI_SRC
@@ -50,4 +47,3 @@ if(PXX2 OR MULTIMODULE)
../common/stdlcd/radio_spectrum_analyser.cpp
)
endif()