Skip to content

Commit ae9133e

Browse files
committed
SNES: Moved snes9x back to a standalone app (rel #231)
This opens a few optimization possibilities such as relying more on IRAM, as well as reclaiming the 25KB or so of internal RAM stolen by the other retro-core apps. Of course it increases flash size by over 400KB, but what can you do...
1 parent 16c7830 commit ae9133e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+24
-11
lines changed

components/retro-go/targets/esp32-p4/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# .fw file format, if supported by the device
77
# FW_FORMAT = "odroid"
88
# Default apps to build when none is specified (comment to build all)
9-
DEFAULT_APPS = "launcher retro-core gwenesis fmsx prboom-go gbsp"
9+
DEFAULT_APPS = " ".join(PROJECT_APPS.keys()) # All of them all the time!

launcher/main/applications.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ static void application(const char *desc, const char *name, const char *exts, co
677677
void applications_init(void)
678678
{
679679
application("Nintendo Entertainment System", "nes", "nes fc fds nsf zip", "retro-core", 16);
680-
application("Super Nintendo", "snes", "smc sfc zip", "retro-core", 0);
680+
application("Super Nintendo", "snes", "smc sfc zip", "snes9x", 0);
681681
application("Nintendo Gameboy", "gb", "gb gbc zip", "retro-core", 0);
682682
application("Nintendo Gameboy Color", "gbc", "gbc gb zip", "retro-core", 0);
683683
application("Nintendo Gameboy Advance", "gba", "gba zip", "gbsp", 0);

retro-core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
set(COMPONENTS "main retro-go nofrendo gnuboy pce-go gw-emulator handy smsplus snes9x")
2+
set(COMPONENTS "main retro-go nofrendo gnuboy pce-go gw-emulator handy smsplus")
33
set(RG_ENABLE_NETWORKING 0)
44
include(../base.cmake)
55
project(retro-core)

retro-core/main/main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ void app_main(void)
2121
sms_main();
2222
else if (strcmp(app->configNs, "gw") == 0)
2323
gw_main();
24-
else if (strcmp(app->configNs, "snes") == 0)
25-
snes_main();
2624
#ifndef __TINYC__
2725
else if (strcmp(app->configNs, "lnx") == 0)
2826
lynx_main();

retro-go.code-workspace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
{
1919
"path": "prboom-go"
2020
},
21+
{
22+
"path": "snes9x"
23+
},
2124
{
2225
"path": "retro-core"
2326
},

rg_tool.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
DEFAULT_TARGET = os.getenv("RG_TOOL_TARGET", "odroid-go")
1515
DEFAULT_BAUD = os.getenv("RG_TOOL_BAUD", "1152000")
1616
DEFAULT_PORT = os.getenv("RG_TOOL_PORT", "COM3")
17-
DEFAULT_APPS = os.getenv("RG_TOOL_APPS", "launcher retro-core prboom-go gwenesis fmsx")
17+
DEFAULT_APPS = os.getenv("RG_TOOL_APPS", "launcher retro-core prboom-go snes9x gwenesis fmsx")
1818
PROJECT_NAME = os.getenv("PROJECT_NAME", "Retro-Go")
1919
PROJECT_ICON = os.getenv("PROJECT_ICON", "assets/icon.raw")
2020
PROJECT_APPS = {
2121
# Project name Type, SubType, Size
2222
'launcher': [0, 0, 1048576],
2323
'updater': [0, 0, 524288], # Should be first to allow growth but it interfere with boot for now
24-
'retro-core': [0, 0, 1048576],
24+
'retro-core': [0, 0, 851968],
2525
'prboom-go': [0, 0, 851968],
26+
'snes9x': [0, 0, 655360],
2627
'gwenesis': [0, 0, 1048576],
2728
'fmsx': [0, 0, 655360],
2829
'gbsp': [0, 0, 851968],

snes9x/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cmake_minimum_required(VERSION 3.5)
2+
set(COMPONENTS "main retro-go snes9x")
3+
set(RG_ENABLE_NETWORKING 0)
4+
include(../base.cmake)
5+
project(snes9x)
File renamed without changes.

0 commit comments

Comments
 (0)