summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-08-30 07:15:19 (GMT)
committerRiku Isokoski <riksu9000@gmail.com>2021-08-30 07:15:19 (GMT)
commit21d37d1e234b217b3e71dc65eb19db197ee21bad (patch)
treed1082c3dbcddd6d56fbb0f14fc9100f1efbfe441 /src/CMakeLists.txt
parent085c9ab2e15b35af01d73e823a87994a7a24a76f (diff)
parent6c023785e53c507f7cb20703f5f3a221ea095068 (diff)
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae3cc3b..a724290 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -418,6 +418,7 @@ list(APPEND SOURCE_FILES
displayapp/screens/BatteryInfo.cpp
displayapp/screens/Steps.cpp
displayapp/screens/Timer.cpp
+ displayapp/Colors.cpp
## Settings
displayapp/screens/settings/QuickSettings.cpp
@@ -427,6 +428,7 @@ list(APPEND SOURCE_FILES
displayapp/screens/settings/SettingWakeUp.cpp
displayapp/screens/settings/SettingDisplay.cpp
displayapp/screens/settings/SettingSteps.cpp
+ displayapp/screens/settings/SettingPineTimeStyle.cpp
## Watch faces
displayapp/icons/bg_clock.c
@@ -610,6 +612,7 @@ set(INCLUDE_FILES
displayapp/screens/Metronome.h
displayapp/screens/Motion.h
displayapp/screens/Timer.h
+ displayapp/Colors.h
drivers/St7789.h
drivers/SpiNorFlash.h
drivers/SpiMaster.h