Merge branch 'dev'

Author: ducalex

BUILDING.md

@@ -1,12 +1,9 @@
 # Building Retro-Go
 
 ## Prerequisites
-You will need a working installation of [esp-idf](https://docs.espressif.com/projects/esp-idf/en/release-v4.3/esp32/get-started/index.html#get-started-get-prerequisites). Versions 4.1 to 4.4 are supported.
+You will need a working installation of [esp-idf](https://docs.espressif.com/projects/esp-idf/en/release-v4.3/esp32/get-started/index.html#get-started-get-prerequisites). Versions 4.2 to 5.2 are supported.
 
-Version 5.0 is also mostly supported, but you will have to build with `--no-networking` and there are
-some performance issues.
-
-_Note: As of retro-go 1.35, I use 4.3.3. Version 4.1.x was used for 1.20 to 1.34 versions._
+_Note: As of retro-go 1.35, I use 4.3. Version 4.1 was used for 1.20 to 1.34 versions._
 
 ### ESP-IDF Patches
 Patching esp-idf may be required for full functionality. Patches are located in `tools/patches` and can be applied to your global esp-idf installation, they will not break your other projects/devices.
@@ -34,6 +31,8 @@ There are generally two active git branches on retro-go:
 For a smaller build you can also specify which apps you want, for example the launcher + DOOM only:
 1. `./rg_tool.py build-fw launcher 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.
+
 
 ## Build, flash, and monitor individual apps for faster development:
 It would be tedious to build, move to SD, and flash a full .fw all the time during development. Instead you can:

CHANGELOG.md

@@ -1,3 +1,12 @@
+# Retro-Go 1.41 (2024-??-??)
+- MSX: Added fMSX emulator
+- COL: Added virtual keyboard so that more games work
+- COL: Fixed savestates not working
+- All: Improved scaling; you can now zoom to any size you want!
+- All: Eliminated battery icon flicker
+- All: Added overclock option in the debug menu (need feedback before making it permanent)
+
+
 # Retro-Go 1.40 (2024-02-27)
 - NES: Added sound emulation to mapper 19 (Pacman Championship Edition)
 - NES: Added 2KB CHR support to mapper 64 (Rolling Thunder)

README.md

@@ -74,6 +74,8 @@ Some emulators support loading a BIOS. The files should be placed as follows:
 - GB: `/retro-go/bios/gb_bios.bin`
 - GBC: `/retro-go/bios/gbc_bios.bin`
 - FDS: `/retro-go/bios/fds_bios.bin`
+- MSX: In folder `/retro-go/bios/msx/` put: `MSX.ROM` `MSX2.ROM` `MSX2EXT.ROM` `MSX2P.ROM` `MSX2PEXT.ROM` `FMPAC.ROM` `DISK.ROM` `MSXDOS2.ROM` `PAINTER.ROM` `KANJI.ROM`
+
 
 ## Game & Watch
 The roms must be packed with [LCD-Game-Shrinker](https://github.com/bzhxx/LCD-Game-Shrinker) and a tutorial can be [found here](https://gist.github.com/DNA64/16fed499d6bd4664b78b4c0a9638e4ef).
@@ -174,6 +176,7 @@ Instructions moved to [BUILDING.md](BUILDING.md).
 - The DOOM engine is a port of [PrBoom 2.5.0](http://prboom.sourceforge.net/).
 - The Genesis emulator is a port of [Gwenesis](https://github.com/bzhxx/gwenesis/) by bzhxx.
 - The Game & Watch emulator is a port of [lcd-game-emulator](https://github.com/bzhxx/lcd-game-emulator) by bzhxx.
+- The MSX emulator is a port of [fMSX](https://fms.komkon.org/fMSX/) by Marat Fayzullin.
 - PNG support is provided by [lodepng](https://github.com/lvandeve/lodepng/).
 - PCE cover art is from [Christian_Haitian](https://github.com/christianhaitian).
 - Some icons from [Rokey](https://iconarchive.com/show/seed-icons-by-rokey.html).
@@ -183,5 +186,5 @@ Instructions moved to [BUILDING.md](BUILDING.md).
 
 # License
 Everything in this project is licensed under the [GPLv2 license](COPYING) with the exception of the following components:
-- components/retro-go (Retro-Go's framework, zlib)
+- fmsx/components/fmsx (MSX Emulator, custom non-commercial license)
 - handy-go/components/handy (Lynx emulator, zlib)

assets/es-theme-gbz35-master.zip

@@ -11,11 +11,6 @@ macro(rg_setup_compile_options)
         ${ARGV}
     )
 
-    if(NOT ";${ARGV};" MATCHES ";-O[0123gs];")
-        # Only default to -O3 if not specified by the app
-        component_compile_options(-O3)
-    endif()
-
     if(RG_ENABLE_NETPLAY)
         component_compile_options(-DRG_ENABLE_NETWORKING -DRG_ENABLE_NETPLAY)
     elseif(RG_ENABLE_NETWORKING)

base.cmake

@@ -21,23 +21,33 @@ component_compile_options(
     -Wno-unused-function
 )
 set_source_files_properties(
-    rg_audio.c rg_display.c
+    rg_audio.c rg_display.c rg_utils.c rg_surface.c
     PROPERTIES COMPILE_FLAGS
-    -O3
+    -O2
 )
 
-if(RG_ENABLE_NETPLAY)
-    component_compile_options(-DRG_ENABLE_NETWORKING -DRG_ENABLE_NETPLAY)
-elseif(RG_ENABLE_NETWORKING)
-    component_compile_options(-DRG_ENABLE_NETWORKING)
+if (IDF_VERSION_MAJOR EQUAL 5)
+    if(RG_ENABLE_NETPLAY OR RG_ENABLE_NETWORKING)
+        message(WARNING "Retro-Go's networking isn't compatible with esp-idf 5.x")
+    endif()
+else()
+    if(RG_ENABLE_NETPLAY)
+        component_compile_options(-DRG_ENABLE_NETWORKING -DRG_ENABLE_NETPLAY)
+    elseif(RG_ENABLE_NETWORKING)
+        component_compile_options(-DRG_ENABLE_NETWORKING)
+    endif()
 endif()
 
 if(RG_ENABLE_PROFILING)
     component_compile_options(-DRG_ENABLE_PROFILING)
 endif()
 
-if(RG_PROJECT_VERSION)
-    component_compile_options(-DRG_PROJECT_VERSION="${RG_PROJECT_VERSION}")
+if(RG_BUILD_VERSION)
+    component_compile_options(-DRG_BUILD_VERSION="${RG_BUILD_VERSION}")
+endif()
+
+if(RG_BUILD_TYPE)
+    component_compile_options(-DRG_BUILD_TYPE=${RG_BUILD_TYPE})
 endif()
 
 set(RG_TARGET "RG_TARGET_${RG_BUILD_TARGET}")