Fix compile with gvars (#4046)

* Fix compile with gvars

* Rework
This commit is contained in:
3djc
2016-11-19 20:47:04 +01:00
committed by Bertrand Songis
parent 908138d81a
commit 10914c741c
3 changed files with 5 additions and 1 deletions
@@ -63,7 +63,7 @@ endif()
if(GVARS) if(GVARS)
set(GUI_SRC set(GUI_SRC
${GUI_SRC} ${GUI_SRC}
model_gvars.cpp ${GVAR_SCREEN}
) )
endif() endif()
set(FIRMWARE_SRC set(FIRMWARE_SRC
+1
View File
@@ -66,6 +66,7 @@ if(INTERNAL_GPS)
message("Internal GPS enabled") message("Internal GPS enabled")
endif() endif()
set(SERIAL2_DRIVER serial2_driver.cpp) set(SERIAL2_DRIVER serial2_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
set(TARGET_SRC set(TARGET_SRC
${TARGET_SRC} ${TARGET_SRC}
board.cpp board.cpp
+3
View File
@@ -25,6 +25,7 @@ if(PCB STREQUAL X9E)
set(GUI_SRC ${GUI_SRC} bmp.cpp) set(GUI_SRC ${GUI_SRC} bmp.cpp)
set(BITMAPS_TARGET taranis_bitmaps) set(BITMAPS_TARGET taranis_bitmaps)
set(LCD_DRIVER lcd_driver_spi.cpp) set(LCD_DRIVER lcd_driver_spi.cpp)
set(GVAR_SCREEN model_gvars.cpp)
elseif(PCB STREQUAL X9D+) elseif(PCB STREQUAL X9D+)
set(CPU_TYPE STM32F2) set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
@@ -38,6 +39,7 @@ elseif(PCB STREQUAL X9D+)
set(BITMAPS_TARGET taranis_bitmaps) set(BITMAPS_TARGET taranis_bitmaps)
set(LCD_DRIVER lcd_driver_spi.cpp) set(LCD_DRIVER lcd_driver_spi.cpp)
set(SERIAL2_DRIVER serial2_driver.cpp) set(SERIAL2_DRIVER serial2_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
elseif(PCB STREQUAL X9D) elseif(PCB STREQUAL X9D)
set(CPU_TYPE STM32F2) set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
@@ -51,6 +53,7 @@ elseif(PCB STREQUAL X9D)
set(BITMAPS_TARGET taranis_bitmaps) set(BITMAPS_TARGET taranis_bitmaps)
set(LCD_DRIVER lcd_driver_aspi.cpp) set(LCD_DRIVER lcd_driver_aspi.cpp)
set(SERIAL2_DRIVER serial2_driver.cpp) set(SERIAL2_DRIVER serial2_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
elseif(PCB STREQUAL X7D) elseif(PCB STREQUAL X7D)
set(CPU_TYPE STM32F2) set(CPU_TYPE STM32F2)
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)