From ba74e953c4808661ea542737b42ef50a82474bac Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Fri, 18 Oct 2024 02:56:06 +0100 Subject: [PATCH] JS: C define to move JS runner to flash (still external for now) --- applications/main/archive/scenes/archive_scene_browser.c | 4 ++++ applications/services/loader/loader_applications.c | 4 ++++ applications/system/js_app/application.fam | 2 ++ 3 files changed, 10 insertions(+) diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c index a3ad14c1b..9fd36a3c7 100644 --- a/applications/main/archive/scenes/archive_scene_browser.c +++ b/applications/main/archive/scenes/archive_scene_browser.c @@ -42,7 +42,11 @@ const char* archive_get_flipper_app_name(ArchiveFileTypeEnum file_type) { case ArchiveFileTypeDiskImage: return EXT_PATH("apps/USB/mass_storage.fap"); case ArchiveFileTypeJS: +#ifdef JS_RUNNER_FAP return EXT_PATH("apps/assets/js_app.fap"); +#else + return "JS Runner"; +#endif default: return NULL; } diff --git a/applications/services/loader/loader_applications.c b/applications/services/loader/loader_applications.c index aebb03d63..50886f1a9 100644 --- a/applications/services/loader/loader_applications.c +++ b/applications/services/loader/loader_applications.c @@ -11,7 +11,11 @@ #define TAG "LoaderApplications" +#ifdef JS_RUNNER_FAP #define JS_RUNNER_APP EXT_PATH("apps/assets/js_app.fap") +#else +#define JS_RUNNER_APP "JS Runner" +#endif struct LoaderApplications { FuriThread* thread; diff --git a/applications/system/js_app/application.fam b/applications/system/js_app/application.fam index cd30ebe4d..a29251f0e 100644 --- a/applications/system/js_app/application.fam +++ b/applications/system/js_app/application.fam @@ -3,6 +3,8 @@ App( name="JS Runner", apptype=FlipperAppType.EXTERNAL, entry_point="js_app", + cdefines=["JS_RUNNER_FAP"], + # Sources separation breaks linking when internal, comment as needed sources=[ "*.c*", "!modules",