diff --git a/firmware/application/external/external.cmake b/firmware/application/external/external.cmake index d45551afc..0c9a2b46f 100644 --- a/firmware/application/external/external.cmake +++ b/firmware/application/external/external.cmake @@ -1,20 +1,5 @@ set(EXTCPPSRC - #tetris - external/tetris/main.cpp - external/tetris/ui_tetris.cpp - - #breakout - external/breakout/main.cpp - external/breakout/ui_breakout.cpp - - #doom - external/doom/main.cpp - external/doom/ui_doom.cpp - #snake - external/snake/main.cpp - external/snake/ui_snake.cpp - #afsk_rx external/afsk_rx/main.cpp external/afsk_rx/ui_afsk_rx.cpp @@ -70,6 +55,10 @@ set(EXTCPPSRC external/keyfob/ui_keyfob.cpp external/keyfob/ui_keyfob.hpp + #tetris + external/tetris/main.cpp + external/tetris/ui_tetris.cpp + #extsensors external/extsensors/main.cpp external/extsensors/ui_extsensors.cpp @@ -187,9 +176,21 @@ set(EXTCPPSRC external/playlist_editor/main.cpp external/playlist_editor/ui_playlist_editor.cpp + #snake + external/snake/main.cpp + external/snake/ui_snake.cpp + #stopwatch external/stopwatch/main.cpp external/stopwatch/ui_stopwatch.cpp + + #breakout + external/breakout/main.cpp + external/breakout/ui_breakout.cpp + + #doom + external/doom/main.cpp + external/doom/ui_doom.cpp ) set(EXTAPPLIST @@ -207,9 +208,6 @@ set(EXTAPPLIST spainter keyfob tetris - breakout - doom - snake extsensors foxhunt_rx audio_test @@ -238,5 +236,8 @@ set(EXTAPPLIST view_wav sd_wipe playlist_editor + snake stopwatch + breakout + doom ) diff --git a/firmware/application/external/external.ld b/firmware/application/external/external.ld index 3478e73bc..400c1f60f 100644 --- a/firmware/application/external/external.ld +++ b/firmware/application/external/external.ld @@ -157,24 +157,6 @@ SECTIONS *(*ui*external_app*tetris*); } > ram_external_app_tetris - .external_app_breakout : ALIGN(4) SUBALIGN(4) - { - KEEP(*(.external_app.app_breakout.application_information)); - *(*ui*external_app*breakout*); - } > ram_external_app_breakout - - .external_app_snake : ALIGN(4) SUBALIGN(4) - { - KEEP(*(.external_app.app_snake.application_information)); - *(*ui*external_app*snake*); - } > ram_external_app_snake - - .external_app_doom : ALIGN(4) SUBALIGN(4) - { - KEEP(*(.external_app.app_doom.application_information)); - *(*ui*external_app*doom*); - } > ram_external_app_doom - .external_app_extsensors : ALIGN(4) SUBALIGN(4) { KEEP(*(.external_app.app_extsensors.application_information)); @@ -337,6 +319,12 @@ SECTIONS *(*ui*external_app*playlist_editor*); } > ram_external_app_playlist_editor + .external_app_snake : ALIGN(4) SUBALIGN(4) + { + KEEP(*(.external_app.app_snake.application_information)); + *(*ui*external_app*snake*); + } > ram_external_app_snake + .external_app_stopwatch : ALIGN(4) SUBALIGN(4) { KEEP(*(.external_app.app_stopwatch.application_information)); @@ -348,5 +336,17 @@ SECTIONS *(*ui*external_app*wefax_rx*); } > ram_external_app_wefax_rx + .external_app_breakout : ALIGN(4) SUBALIGN(4) + { + KEEP(*(.external_app.app_breakout.application_information)); + *(*ui*external_app*breakout*); + } > ram_external_app_breakout + + .external_app_doom : ALIGN(4) SUBALIGN(4) + { + KEEP(*(.external_app.app_doom.application_information)); + *(*ui*external_app*doom*); + } > ram_external_app_doom + }