From 1b942ebc4baf453e7f512fa4ffe3a4e123db8348 Mon Sep 17 00:00:00 2001
From: Alex Duchesne <ducalex007@gmail.com>
Date: Fri, 29 Nov 2024 13:54:26 -0500
Subject: [PATCH] Merged launcher into retro-core

Benefits:
- retro-core can now be built and flashed with `idf.py` (assuming the user doesn't care about DOOM and fMSX)
- retro-core being standalone means it can be built for platforms with no concept of partitions/multiple exes
- Reduced firmware size
- All retro-core apps can now access wifi if they want
- Faster builds because it means one less app

Drawbacks:
- It breaks git history for launcher files (but `--follow` mostly works around that)
- The presence of the wifi stack, even when not enabled, reserves some amount of internal memory
---
 BUILDING.md                                      |   8 ++++----
 components/retro-go/config.h                     |   2 +-
 components/retro-go/targets/odroid-go/sdkconfig  |   2 ++
 launcher/CMakeLists.txt                          |   4 ----
 launcher/main/CMakeLists.txt                     |  10 ----------
 retro-core/CMakeLists.txt                        |   3 +--
 retro-core/components/launcher/CMakeLists.txt    |  13 ++++++++++---
 .../components/launcher}/COPYING                 |   0
 .../components/launcher}/CREDITS                 |   0
 .../components/launcher}/applications.c          |   0
 .../components/launcher}/applications.h          |   0
 .../components/launcher}/bookmarks.c             |   0
 .../components/launcher}/bookmarks.h             |   0
 .../components/launcher}/gen_images.py           |   0
 .../components/launcher}/gui.c                   |   0
 .../components/launcher}/gui.h                   |   0
 .../components/launcher}/images.c                |   0
 .../launcher}/images/background_2600.png         | Bin
 .../launcher}/images/background_col.png          | Bin
 .../launcher}/images/background_collections.png  | Bin
 .../launcher}/images/background_doom.png         | Bin
 .../launcher}/images/background_favorite.png     | Bin
 .../launcher}/images/background_gb.png           | Bin
 .../launcher}/images/background_gbc.png          | Bin
 .../launcher}/images/background_gg.png           | Bin
 .../launcher}/images/background_gw.png           | Bin
 .../launcher}/images/background_lnx.png          | Bin
 .../launcher}/images/background_md.png           | Bin
 .../launcher}/images/background_msx.png          | Bin
 .../launcher}/images/background_nes.png          | Bin
 .../launcher}/images/background_pce.png          | Bin
 .../launcher}/images/background_recent.png       | Bin
 .../launcher}/images/background_sms.png          | Bin
 .../launcher}/images/background_snes.png         | Bin
 .../components/launcher}/images/banner_col.png   | Bin
 .../components/launcher}/images/banner_doom.png  | Bin
 .../launcher}/images/banner_favorite.png         | Bin
 .../components/launcher}/images/banner_gb.png    | Bin
 .../components/launcher}/images/banner_gbc.png   | Bin
 .../components/launcher}/images/banner_gg.png    | Bin
 .../components/launcher}/images/banner_gw.png    | Bin
 .../components/launcher}/images/banner_lnx.png   | Bin
 .../components/launcher}/images/banner_md.png    | Bin
 .../components/launcher}/images/banner_nes.png   | Bin
 .../components/launcher}/images/banner_ngp.png   | Bin
 .../components/launcher}/images/banner_pce.png   | Bin
 .../launcher}/images/banner_recent.png           | Bin
 .../components/launcher}/images/banner_sms.png   | Bin
 .../components/launcher}/images/banner_snes.png  | Bin
 .../components/launcher}/images/logo_col.png     | Bin
 .../components/launcher}/images/logo_doom.png    | Bin
 .../launcher}/images/logo_favorite.png           | Bin
 .../components/launcher}/images/logo_gb.png      | Bin
 .../components/launcher}/images/logo_gbc.png     | Bin
 .../components/launcher}/images/logo_gg.png      | Bin
 .../components/launcher}/images/logo_gw.png      | Bin
 .../components/launcher}/images/logo_lnx.png     | Bin
 .../components/launcher}/images/logo_md.png      | Bin
 .../components/launcher}/images/logo_msx.png     | Bin
 .../components/launcher}/images/logo_nes.png     | Bin
 .../components/launcher}/images/logo_ngp.png     | Bin
 .../components/launcher}/images/logo_pce.png     | Bin
 .../components/launcher}/images/logo_recent.png  | Bin
 .../components/launcher}/images/logo_sms.png     | Bin
 .../components/launcher}/images/logo_snes.png    | Bin
 .../components/launcher}/main.c                  |   4 ++--
 .../components/launcher}/updater.c               |   0
 .../components/launcher}/updater.h               |   0
 .../components/launcher}/webui.c                 |   0
 .../components/launcher}/webui.h                 |   0
 .../components/launcher}/webui.html.h            |   0
 retro-core/main/main_launcher.c                  |  15 ++++++++-------
 retro-go.code-workspace                          |   3 ---
 rg_config.py                                     |   5 ++---
 rg_tool.py                                       |   4 ----
 75 files changed, 30 insertions(+), 43 deletions(-)
 delete mode 100644 launcher/CMakeLists.txt
 delete mode 100644 launcher/main/CMakeLists.txt
 rename {launcher/main => retro-core/components/launcher}/COPYING (100%)
 rename {launcher/main => retro-core/components/launcher}/CREDITS (100%)
 rename {launcher/main => retro-core/components/launcher}/applications.c (100%)
 rename {launcher/main => retro-core/components/launcher}/applications.h (100%)
 rename {launcher/main => retro-core/components/launcher}/bookmarks.c (100%)
 rename {launcher/main => retro-core/components/launcher}/bookmarks.h (100%)
 rename {launcher/main => retro-core/components/launcher}/gen_images.py (100%)
 rename {launcher/main => retro-core/components/launcher}/gui.c (100%)
 rename {launcher/main => retro-core/components/launcher}/gui.h (100%)
 rename {launcher/main => retro-core/components/launcher}/images.c (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_2600.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_col.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_collections.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_doom.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_favorite.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_gb.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_gbc.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_gg.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_gw.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_lnx.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_md.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_msx.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_nes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_pce.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_recent.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_sms.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/background_snes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_col.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_doom.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_favorite.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_gb.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_gbc.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_gg.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_gw.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_lnx.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_md.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_nes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_ngp.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_pce.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_recent.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_sms.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/banner_snes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_col.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_doom.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_favorite.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_gb.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_gbc.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_gg.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_gw.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_lnx.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_md.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_msx.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_nes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_ngp.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_pce.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_recent.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_sms.png (100%)
 rename {launcher/main => retro-core/components/launcher}/images/logo_snes.png (100%)
 rename {launcher/main => retro-core/components/launcher}/main.c (99%)
 rename {launcher/main => retro-core/components/launcher}/updater.c (100%)
 rename {launcher/main => retro-core/components/launcher}/updater.h (100%)
 rename {launcher/main => retro-core/components/launcher}/webui.c (100%)
 rename {launcher/main => retro-core/components/launcher}/webui.h (100%)
 rename {launcher/main => retro-core/components/launcher}/webui.html.h (100%)

diff --git a/BUILDING.md b/BUILDING.md
index 2b3536232..169bad0e1 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -42,10 +42,10 @@ Run `python rg_tool.py --help` to see all available flags and commands.
 - Generate a .img to be flashed with esptool.py (Serial):\
     `python rg_tool.py build-img` or `python rg_tool.py release` (clean build)
 
-For a smaller build you can also specify which apps you want, for example the launcher + DOOM only:
-1. `python rg_tool.py build-fw launcher prboom-go`
+For a smaller build you can also specify which apps you want, for example DOOM only:
+1. `python rg_tool.py build-fw prboom-go`
 
-Note that the app named `retro-core` contains the following emulators: NES, PCE, G&W, Lynx, and SMS/GG/COL. As such, these emulators cannot be selected individually. The reason for the bundling is simply size, together they account for a mere 700KB instead of almost 3MB when they were built separately.
+Note that the app named `retro-core` contains the launcher as well as the following emulators: NES, PCE, G&W, Lynx, and SMS/GG/COL. As such, these applications cannot be selected individually and if you want the launcher, you need retro-core. The reason for the bundling is mainly greatly reduced firmware size.
 
 
 ## Flashing an image for the first time
@@ -80,7 +80,7 @@ or even do nothing at all. In such cases you should use `python rg_tool.py ...`
 
 
 ## Changing the launcher's images
-All images used by the launcher (headers, logos) are located in `launcher/main/images`. If you edit them you must run the `launcher/main/gen_images.py` script to regenerate `images.c`. Magenta (rgb(255, 0, 255) / 0xF81F) is used as the transparency color.
+All images used by the launcher (headers, logos) are located in `retro-core/components/launcher/images`. If you edit them you must run the `retro-core/components/launcher/gen_images.py` script to regenerate `images.c`. Magenta (rgb(255, 0, 255) / 0xF81F) is used as the transparency color.
 
 
 ## Updating translations
diff --git a/components/retro-go/config.h b/components/retro-go/config.h
index 328ecf11a..34231705b 100644
--- a/components/retro-go/config.h
+++ b/components/retro-go/config.h
@@ -75,7 +75,7 @@
 // #endif
 
 #ifndef RG_APP_LAUNCHER
-#define RG_APP_LAUNCHER "launcher"
+#define RG_APP_LAUNCHER "retro-core"
 #endif
 
 #ifndef RG_APP_FACTORY
diff --git a/components/retro-go/targets/odroid-go/sdkconfig b/components/retro-go/targets/odroid-go/sdkconfig
index 50d120339..a5f380b97 100644
--- a/components/retro-go/targets/odroid-go/sdkconfig
+++ b/components/retro-go/targets/odroid-go/sdkconfig
@@ -90,6 +90,8 @@ CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=n
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
 CONFIG_SPIRAM_OCCUPY_NO_HOST=n
+# This places Wifi/LWIP buffers on the external memory (saves 13KB)
+CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
 
 #
 # FAT Filesystem support
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
deleted file mode 100644
index 96366d1f3..000000000
--- a/launcher/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-set(COMPONENTS "main retro-go wifi esp_http_server")
-include(../base.cmake)
-project(launcher)
diff --git a/launcher/main/CMakeLists.txt b/launcher/main/CMakeLists.txt
deleted file mode 100644
index d2a023124..000000000
--- a/launcher/main/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-register_component()
-rg_setup_compile_options(-O2 -Wno-error=format -Wno-error=char-subscripts -mfix-esp32-psram-cache-issue)
-
-# add_custom_command(OUTPUT images.c
-#                    COMMAND python ${COMPONENT_DIR}/gen_images.py
-#                    VERBATIM)
-# add_custom_target(images DEPENDS images.c)
-# add_dependencies(${COMPONENT_LIB} images)
diff --git a/retro-core/CMakeLists.txt b/retro-core/CMakeLists.txt
index b49708754..cc0742eeb 100644
--- a/retro-core/CMakeLists.txt
+++ b/retro-core/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.5)
-set(COMPONENTS "main retro-go nofrendo gnuboy pce-go gw-emulator handy smsplus snes9x")
-set(RG_ENABLE_NETWORKING 0)
+set(COMPONENTS "main retro-go nofrendo gnuboy pce-go gw-emulator handy smsplus snes9x launcher wifi esp_http_server")
 include(../base.cmake)
 project(retro-core)
diff --git a/retro-core/components/launcher/CMakeLists.txt b/retro-core/components/launcher/CMakeLists.txt
index 7b2ed4904..ce8804acc 100644
--- a/retro-core/components/launcher/CMakeLists.txt
+++ b/retro-core/components/launcher/CMakeLists.txt
@@ -1,4 +1,11 @@
-set(COMPONENT_SRCDIRS ". libs")
-set(COMPONENT_ADD_INCLUDEDIRS ". libs")
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+set(COMPONENT_REQUIRES "retro-go esp_http_server")
 register_component()
-rg_setup_compile_options(-O2)
+rg_setup_compile_options(-O2 -Wno-error=format -Wno-error=char-subscripts -mfix-esp32-psram-cache-issue)
+
+# add_custom_command(OUTPUT images.c
+#                    COMMAND python ${COMPONENT_DIR}/gen_images.py
+#                    VERBATIM)
+# add_custom_target(images DEPENDS images.c)
+# add_dependencies(${COMPONENT_LIB} images)
diff --git a/launcher/main/COPYING b/retro-core/components/launcher/COPYING
similarity index 100%
rename from launcher/main/COPYING
rename to retro-core/components/launcher/COPYING
diff --git a/launcher/main/CREDITS b/retro-core/components/launcher/CREDITS
similarity index 100%
rename from launcher/main/CREDITS
rename to retro-core/components/launcher/CREDITS
diff --git a/launcher/main/applications.c b/retro-core/components/launcher/applications.c
similarity index 100%
rename from launcher/main/applications.c
rename to retro-core/components/launcher/applications.c
diff --git a/launcher/main/applications.h b/retro-core/components/launcher/applications.h
similarity index 100%
rename from launcher/main/applications.h
rename to retro-core/components/launcher/applications.h
diff --git a/launcher/main/bookmarks.c b/retro-core/components/launcher/bookmarks.c
similarity index 100%
rename from launcher/main/bookmarks.c
rename to retro-core/components/launcher/bookmarks.c
diff --git a/launcher/main/bookmarks.h b/retro-core/components/launcher/bookmarks.h
similarity index 100%
rename from launcher/main/bookmarks.h
rename to retro-core/components/launcher/bookmarks.h
diff --git a/launcher/main/gen_images.py b/retro-core/components/launcher/gen_images.py
similarity index 100%
rename from launcher/main/gen_images.py
rename to retro-core/components/launcher/gen_images.py
diff --git a/launcher/main/gui.c b/retro-core/components/launcher/gui.c
similarity index 100%
rename from launcher/main/gui.c
rename to retro-core/components/launcher/gui.c
diff --git a/launcher/main/gui.h b/retro-core/components/launcher/gui.h
similarity index 100%
rename from launcher/main/gui.h
rename to retro-core/components/launcher/gui.h
diff --git a/launcher/main/images.c b/retro-core/components/launcher/images.c
similarity index 100%
rename from launcher/main/images.c
rename to retro-core/components/launcher/images.c
diff --git a/launcher/main/images/background_2600.png b/retro-core/components/launcher/images/background_2600.png
similarity index 100%
rename from launcher/main/images/background_2600.png
rename to retro-core/components/launcher/images/background_2600.png
diff --git a/launcher/main/images/background_col.png b/retro-core/components/launcher/images/background_col.png
similarity index 100%
rename from launcher/main/images/background_col.png
rename to retro-core/components/launcher/images/background_col.png
diff --git a/launcher/main/images/background_collections.png b/retro-core/components/launcher/images/background_collections.png
similarity index 100%
rename from launcher/main/images/background_collections.png
rename to retro-core/components/launcher/images/background_collections.png
diff --git a/launcher/main/images/background_doom.png b/retro-core/components/launcher/images/background_doom.png
similarity index 100%
rename from launcher/main/images/background_doom.png
rename to retro-core/components/launcher/images/background_doom.png
diff --git a/launcher/main/images/background_favorite.png b/retro-core/components/launcher/images/background_favorite.png
similarity index 100%
rename from launcher/main/images/background_favorite.png
rename to retro-core/components/launcher/images/background_favorite.png
diff --git a/launcher/main/images/background_gb.png b/retro-core/components/launcher/images/background_gb.png
similarity index 100%
rename from launcher/main/images/background_gb.png
rename to retro-core/components/launcher/images/background_gb.png
diff --git a/launcher/main/images/background_gbc.png b/retro-core/components/launcher/images/background_gbc.png
similarity index 100%
rename from launcher/main/images/background_gbc.png
rename to retro-core/components/launcher/images/background_gbc.png
diff --git a/launcher/main/images/background_gg.png b/retro-core/components/launcher/images/background_gg.png
similarity index 100%
rename from launcher/main/images/background_gg.png
rename to retro-core/components/launcher/images/background_gg.png
diff --git a/launcher/main/images/background_gw.png b/retro-core/components/launcher/images/background_gw.png
similarity index 100%
rename from launcher/main/images/background_gw.png
rename to retro-core/components/launcher/images/background_gw.png
diff --git a/launcher/main/images/background_lnx.png b/retro-core/components/launcher/images/background_lnx.png
similarity index 100%
rename from launcher/main/images/background_lnx.png
rename to retro-core/components/launcher/images/background_lnx.png
diff --git a/launcher/main/images/background_md.png b/retro-core/components/launcher/images/background_md.png
similarity index 100%
rename from launcher/main/images/background_md.png
rename to retro-core/components/launcher/images/background_md.png
diff --git a/launcher/main/images/background_msx.png b/retro-core/components/launcher/images/background_msx.png
similarity index 100%
rename from launcher/main/images/background_msx.png
rename to retro-core/components/launcher/images/background_msx.png
diff --git a/launcher/main/images/background_nes.png b/retro-core/components/launcher/images/background_nes.png
similarity index 100%
rename from launcher/main/images/background_nes.png
rename to retro-core/components/launcher/images/background_nes.png
diff --git a/launcher/main/images/background_pce.png b/retro-core/components/launcher/images/background_pce.png
similarity index 100%
rename from launcher/main/images/background_pce.png
rename to retro-core/components/launcher/images/background_pce.png
diff --git a/launcher/main/images/background_recent.png b/retro-core/components/launcher/images/background_recent.png
similarity index 100%
rename from launcher/main/images/background_recent.png
rename to retro-core/components/launcher/images/background_recent.png
diff --git a/launcher/main/images/background_sms.png b/retro-core/components/launcher/images/background_sms.png
similarity index 100%
rename from launcher/main/images/background_sms.png
rename to retro-core/components/launcher/images/background_sms.png
diff --git a/launcher/main/images/background_snes.png b/retro-core/components/launcher/images/background_snes.png
similarity index 100%
rename from launcher/main/images/background_snes.png
rename to retro-core/components/launcher/images/background_snes.png
diff --git a/launcher/main/images/banner_col.png b/retro-core/components/launcher/images/banner_col.png
similarity index 100%
rename from launcher/main/images/banner_col.png
rename to retro-core/components/launcher/images/banner_col.png
diff --git a/launcher/main/images/banner_doom.png b/retro-core/components/launcher/images/banner_doom.png
similarity index 100%
rename from launcher/main/images/banner_doom.png
rename to retro-core/components/launcher/images/banner_doom.png
diff --git a/launcher/main/images/banner_favorite.png b/retro-core/components/launcher/images/banner_favorite.png
similarity index 100%
rename from launcher/main/images/banner_favorite.png
rename to retro-core/components/launcher/images/banner_favorite.png
diff --git a/launcher/main/images/banner_gb.png b/retro-core/components/launcher/images/banner_gb.png
similarity index 100%
rename from launcher/main/images/banner_gb.png
rename to retro-core/components/launcher/images/banner_gb.png
diff --git a/launcher/main/images/banner_gbc.png b/retro-core/components/launcher/images/banner_gbc.png
similarity index 100%
rename from launcher/main/images/banner_gbc.png
rename to retro-core/components/launcher/images/banner_gbc.png
diff --git a/launcher/main/images/banner_gg.png b/retro-core/components/launcher/images/banner_gg.png
similarity index 100%
rename from launcher/main/images/banner_gg.png
rename to retro-core/components/launcher/images/banner_gg.png
diff --git a/launcher/main/images/banner_gw.png b/retro-core/components/launcher/images/banner_gw.png
similarity index 100%
rename from launcher/main/images/banner_gw.png
rename to retro-core/components/launcher/images/banner_gw.png
diff --git a/launcher/main/images/banner_lnx.png b/retro-core/components/launcher/images/banner_lnx.png
similarity index 100%
rename from launcher/main/images/banner_lnx.png
rename to retro-core/components/launcher/images/banner_lnx.png
diff --git a/launcher/main/images/banner_md.png b/retro-core/components/launcher/images/banner_md.png
similarity index 100%
rename from launcher/main/images/banner_md.png
rename to retro-core/components/launcher/images/banner_md.png
diff --git a/launcher/main/images/banner_nes.png b/retro-core/components/launcher/images/banner_nes.png
similarity index 100%
rename from launcher/main/images/banner_nes.png
rename to retro-core/components/launcher/images/banner_nes.png
diff --git a/launcher/main/images/banner_ngp.png b/retro-core/components/launcher/images/banner_ngp.png
similarity index 100%
rename from launcher/main/images/banner_ngp.png
rename to retro-core/components/launcher/images/banner_ngp.png
diff --git a/launcher/main/images/banner_pce.png b/retro-core/components/launcher/images/banner_pce.png
similarity index 100%
rename from launcher/main/images/banner_pce.png
rename to retro-core/components/launcher/images/banner_pce.png
diff --git a/launcher/main/images/banner_recent.png b/retro-core/components/launcher/images/banner_recent.png
similarity index 100%
rename from launcher/main/images/banner_recent.png
rename to retro-core/components/launcher/images/banner_recent.png
diff --git a/launcher/main/images/banner_sms.png b/retro-core/components/launcher/images/banner_sms.png
similarity index 100%
rename from launcher/main/images/banner_sms.png
rename to retro-core/components/launcher/images/banner_sms.png
diff --git a/launcher/main/images/banner_snes.png b/retro-core/components/launcher/images/banner_snes.png
similarity index 100%
rename from launcher/main/images/banner_snes.png
rename to retro-core/components/launcher/images/banner_snes.png
diff --git a/launcher/main/images/logo_col.png b/retro-core/components/launcher/images/logo_col.png
similarity index 100%
rename from launcher/main/images/logo_col.png
rename to retro-core/components/launcher/images/logo_col.png
diff --git a/launcher/main/images/logo_doom.png b/retro-core/components/launcher/images/logo_doom.png
similarity index 100%
rename from launcher/main/images/logo_doom.png
rename to retro-core/components/launcher/images/logo_doom.png
diff --git a/launcher/main/images/logo_favorite.png b/retro-core/components/launcher/images/logo_favorite.png
similarity index 100%
rename from launcher/main/images/logo_favorite.png
rename to retro-core/components/launcher/images/logo_favorite.png
diff --git a/launcher/main/images/logo_gb.png b/retro-core/components/launcher/images/logo_gb.png
similarity index 100%
rename from launcher/main/images/logo_gb.png
rename to retro-core/components/launcher/images/logo_gb.png
diff --git a/launcher/main/images/logo_gbc.png b/retro-core/components/launcher/images/logo_gbc.png
similarity index 100%
rename from launcher/main/images/logo_gbc.png
rename to retro-core/components/launcher/images/logo_gbc.png
diff --git a/launcher/main/images/logo_gg.png b/retro-core/components/launcher/images/logo_gg.png
similarity index 100%
rename from launcher/main/images/logo_gg.png
rename to retro-core/components/launcher/images/logo_gg.png
diff --git a/launcher/main/images/logo_gw.png b/retro-core/components/launcher/images/logo_gw.png
similarity index 100%
rename from launcher/main/images/logo_gw.png
rename to retro-core/components/launcher/images/logo_gw.png
diff --git a/launcher/main/images/logo_lnx.png b/retro-core/components/launcher/images/logo_lnx.png
similarity index 100%
rename from launcher/main/images/logo_lnx.png
rename to retro-core/components/launcher/images/logo_lnx.png
diff --git a/launcher/main/images/logo_md.png b/retro-core/components/launcher/images/logo_md.png
similarity index 100%
rename from launcher/main/images/logo_md.png
rename to retro-core/components/launcher/images/logo_md.png
diff --git a/launcher/main/images/logo_msx.png b/retro-core/components/launcher/images/logo_msx.png
similarity index 100%
rename from launcher/main/images/logo_msx.png
rename to retro-core/components/launcher/images/logo_msx.png
diff --git a/launcher/main/images/logo_nes.png b/retro-core/components/launcher/images/logo_nes.png
similarity index 100%
rename from launcher/main/images/logo_nes.png
rename to retro-core/components/launcher/images/logo_nes.png
diff --git a/launcher/main/images/logo_ngp.png b/retro-core/components/launcher/images/logo_ngp.png
similarity index 100%
rename from launcher/main/images/logo_ngp.png
rename to retro-core/components/launcher/images/logo_ngp.png
diff --git a/launcher/main/images/logo_pce.png b/retro-core/components/launcher/images/logo_pce.png
similarity index 100%
rename from launcher/main/images/logo_pce.png
rename to retro-core/components/launcher/images/logo_pce.png
diff --git a/launcher/main/images/logo_recent.png b/retro-core/components/launcher/images/logo_recent.png
similarity index 100%
rename from launcher/main/images/logo_recent.png
rename to retro-core/components/launcher/images/logo_recent.png
diff --git a/launcher/main/images/logo_sms.png b/retro-core/components/launcher/images/logo_sms.png
similarity index 100%
rename from launcher/main/images/logo_sms.png
rename to retro-core/components/launcher/images/logo_sms.png
diff --git a/launcher/main/images/logo_snes.png b/retro-core/components/launcher/images/logo_snes.png
similarity index 100%
rename from launcher/main/images/logo_snes.png
rename to retro-core/components/launcher/images/logo_snes.png
diff --git a/launcher/main/main.c b/retro-core/components/launcher/main.c
similarity index 99%
rename from launcher/main/main.c
rename to retro-core/components/launcher/main.c
index 7b2b458a0..2b06d065d 100644
--- a/launcher/main/main.c
+++ b/retro-core/components/launcher/main.c
@@ -440,7 +440,7 @@ void event_handler(int event, void *arg)
         gui_redraw();
 }
 
-void app_main(void)
+void launcher_main(void)
 {
     const rg_handlers_t handlers = {
         .event = &event_handler,
@@ -450,7 +450,7 @@ void app_main(void)
         RG_DIALOG_END,
     };
 
-    app = rg_system_init(32000, &handlers, options);
+    app = rg_system_reinit(32000, &handlers, options);
     app->configNs = "launcher";
     app->isLauncher = true;
 
diff --git a/launcher/main/updater.c b/retro-core/components/launcher/updater.c
similarity index 100%
rename from launcher/main/updater.c
rename to retro-core/components/launcher/updater.c
diff --git a/launcher/main/updater.h b/retro-core/components/launcher/updater.h
similarity index 100%
rename from launcher/main/updater.h
rename to retro-core/components/launcher/updater.h
diff --git a/launcher/main/webui.c b/retro-core/components/launcher/webui.c
similarity index 100%
rename from launcher/main/webui.c
rename to retro-core/components/launcher/webui.c
diff --git a/launcher/main/webui.h b/retro-core/components/launcher/webui.h
similarity index 100%
rename from launcher/main/webui.h
rename to retro-core/components/launcher/webui.h
diff --git a/launcher/main/webui.html.h b/retro-core/components/launcher/webui.html.h
similarity index 100%
rename from launcher/main/webui.html.h
rename to retro-core/components/launcher/webui.html.h
diff --git a/retro-core/main/main_launcher.c b/retro-core/main/main_launcher.c
index 0c6b88c8f..449786060 100644
--- a/retro-core/main/main_launcher.c
+++ b/retro-core/main/main_launcher.c
@@ -1,9 +1,10 @@
 #include "shared.h"
 
-void launcher_main(void)
-{
-    // app->configNs = "launcher";
-    // app->isLauncher = true;
-    // Currently a separate app, see launcher in project's root
-    rg_system_exit();
-}
+// launcher_main() is in ../components/launcher/main.c
+
+// void launcher_main(void)
+// {
+//     app->configNs = "launcher";
+//     app->isLauncher = true;
+//     rg_system_exit();
+// }
diff --git a/retro-go.code-workspace b/retro-go.code-workspace
index 88b9c7ced..2abdd5ae1 100644
--- a/retro-go.code-workspace
+++ b/retro-go.code-workspace
@@ -9,9 +9,6 @@
 		{
 			"path": "gwenesis"
 		},
-		{
-			"path": "launcher"
-		},
 		{
 			"path": "prboom-go"
 		},
diff --git a/rg_config.py b/rg_config.py
index d3f45c314..7ac59be24 100644
--- a/rg_config.py
+++ b/rg_config.py
@@ -10,9 +10,8 @@
 PROJECT_ICON = "assets/icon.raw"
 PROJECT_APPS = {
   # Project name  Type, SubType, Size
-  'launcher':     [0, 0, 917504],
-  'retro-core':   [0, 0, 917504],
-  'prboom-go':    [0, 0, 786432],
+  'retro-core':   [0, 0, 1638400],
+  'prboom-go':    [0, 0, 851968],
   'gwenesis':     [0, 0, 983040],
   'fmsx':         [0, 0, 589824],
 }
diff --git a/rg_tool.py b/rg_tool.py
index e42b42869..8c443daa4 100755
--- a/rg_tool.py
+++ b/rg_tool.py
@@ -214,10 +214,6 @@ def monitor_app(app, port, baudrate=115200):
         exec(f.read())
 
 try:
-    if command in ["build-fw", "build-img", "release", "install"] and "launcher" not in apps:
-        print("\nWARNING: The launcher is mandatory for those apps and will be included!\n")
-        apps.insert(0, "launcher")
-
     if command in ["clean", "release"]:
         print("=== Step: Cleaning ===\n")
         for app in apps: