diff options
| author | its your bedtime <23366927+itsyourbedtime@users.noreply.github.com> | 2021-04-13 21:06:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 21:06:25 +0300 |
| commit | d1f523687e918725d06d7afe1270b853781f255e (patch) | |
| tree | b1f9dc7cde32d7380da1513ab871351fff8c287a /applications/applications.mk | |
| parent | eae9cb3514736f5bdf04207319f7d31a1e67784c (diff) | |
[FL-1090] Dolphin scenes (#402)
* dolphin scene draft wip
* gui/elements multiline framed text added
* zoom poc
* item callbacks
* engine tweaks
* move scenes out of services
* improve dolphin gfx selection
* glitch hints
* dialogue typewriter effect
* app loading from scenes app, small action changes, passport app(WIP)
* removed passport from main dolphin app, added statusbar
* small elements position fixes
* fix thread alloc, dolphin and dolphin_scene free functions, other minor issues
* sleep emote improvements
* Dolpin: fix memory leaks, variable namings and etc
Co-authored-by: gornekich <44112859+gornekich@users.noreply.github.com>
Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
Diffstat (limited to 'applications/applications.mk')
| -rw-r--r-- | applications/applications.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/applications/applications.mk b/applications/applications.mk index 9d0ef667..9cce8147 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -16,6 +16,7 @@ APP_BT = 1 APP_CLI = 1 APP_SD_FILESYSTEM = 1 BUILD_IRDA = 1 +BUILD_DOLPHIN_SCENE = 1 APP_DOLPHIN = 1 BUILD_EXAMPLE_BLINK = 1 BUILD_EXAMPLE_UART_WRITE = 1 @@ -227,7 +228,6 @@ C_SOURCES += $(APP_DIR)/examples/keypad_test.c BUILD_KEYPAD_TEST = 1 endif - APP_GPIO_DEMO ?= 0 ifeq ($(APP_GPIO_DEMO), 1) CFLAGS += -DAPP_GPIO_DEMO @@ -261,6 +261,18 @@ CFLAGS += -DBUILD_FLOOPPER_BLOOPPER C_SOURCES += $(wildcard $(APP_DIR)/floopper-bloopper/*.c) endif +APP_DOLPHIN_SCENE ?= 0 +ifeq ($(APP_DOLPHIN_SCENE), 1) +CFLAGS += -DAPP_DOLPHIN_SCENE +BUILD_DOLPHIN_SCENE = 1 +endif +BUILD_DOLPHIN_SCENE ?= 0 +ifeq ($(BUILD_DOLPHIN_SCENE), 1) +CFLAGS += -DBUILD_DOLPHIN_SCENE +C_SOURCES += $(wildcard $(APP_DIR)/dolphin_scene/*.c) +C_SOURCES += $(wildcard $(APP_DIR)/passport/*.c) +endif + APP_IBUTTON ?= 0 ifeq ($(APP_IBUTTON), 1) CFLAGS += -DAPP_IBUTTON |