Update macOS SDL3 to 3.2.20

Signed-off-by: Rafael Kitover <rkitover@gmail.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -20,7 +20,7 @@ body:
   - type: markdown
     attributes:
       value: |
-            Please try to troubleshoot using the information on this page:h ttps://wiki.archlinux.org/index.php/Gamepad **BEFORE** filing an issue. 
+            Please try to troubleshoot using the information on this page: https://wiki.archlinux.org/index.php/Gamepad **BEFORE** filing an issue. 
             We use SDL for joystick support, any problems will generally be an issue with SDL and **NOT** the emulator.
             If relevant, the joystick you are using and the drivers you are using for it:          
   - type: textarea
@@ -46,7 +46,7 @@ body:
     attributes:
       label: Steps to reproduce the problem
       description: "How do you trigger this bug? Please walk us through it step by step."
-      value: |
+      placeholder: |
             1.
             2.
             3.
@@ -81,29 +81,76 @@ body:
             Clean, Intro'd or Hacked?:(Attach Patch here)
     validations:
       required: false
-  - type: textarea
-    id: Settings
+  - type: markdown
     attributes:
-      label: What settings are you using?
-      description: "Please list them"
-      value: |
-            Video driver (simple, opengl):
-            Sound driver (directsound, xaudio, openal, SDL):
-            Scale Filter Used?:
+      value: "### Emulator Settings\nList the settings you are using."
+  - type: input
+    id: Video_Driver
+    attributes:
+      label: Video Driver
+      description: "Specify which video driver you're using (e.g., Simple, OpenGL)."
     validations:
       required: true
-  - type: textarea
-    id: SysInfo
+  - type: input
+    id: Sound_Driver
     attributes:
-      label: Specifications and Build details
-      description: "List your system information, you can obtain this from MSINFO32 and the emulators Titlebar."
-      value: |
-            VBA-M: (include commit version number and whether you are using the 32-bit or 64-bit version)
-            OS: (include version and OS build number using WinVer if on Windows):
-            If using Linux, specify if using xorg or Wayland:
-            CPU:
-            GPU:
-            RAM:
+      label: Sound Driver
+      description: "Specify which sound driver you're using (e.g., DirectSound, XAudio, OpenAL, SDL)."
+    validations:
+      required: true
+  - type: input
+    id: Scale_Filter
+    attributes:
+      label: Scale Filter
+      description: "Specify which scale filter you are using."
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: "### Specifications and Build Details\nList your system information, you can obtain this from MSINFO32 and the emulator's Titlebar."
+  - type: input
+    id: VBA-M
+    attributes:
+      label: VBA-M Version
+      description: "Include commit version number and whether you are using the 32-bit or 64-bit version."
+    validations:
+      required: true
+  - type: input
+    id: OS
+    attributes:
+      label: Operating System
+      description: "Include version and OS build number using WinVer if on Windows."
+    validations:
+      required: true
+  - type: dropdown
+    id: Linux_Display_Server
+    attributes:
+      label: Linux Display Server
+      description: "Specify whether using Xorg or Wayland."
+      options:
+        - Xorg
+        - Wayland
+    validations:
+      required: false
+  - type: input
+    id: CPU
+    attributes:
+      label: CPU Model
+      description: "Provide details of your CPU model."
+    validations:
+      required: true
+  - type: input
+    id: GPU
+    attributes:
+      label: GPU Model
+      description: "Provide details of your GPU model."
+    validations:
+      required: true
+  - type: input
+    id: RAM
+    attributes:
+      label: RAM Size
+      description: "Specify the amount of RAM installed."
     validations:
       required: true
   - type: checkboxes

.github/workflows/devkitpro-build.yml

@@ -5,7 +5,8 @@ jobs:
   build:
     strategy:
       matrix:
-        target_name: [ngc, wii, wiiu, switch]
+#        target_name: [ngc, wii, wiiu, switch]
+        target_name: [ngc, wii, wiiu]
         build_type: [release, debug]
         include:
           - libretro_build: 'DEBUG=0'
@@ -18,8 +19,8 @@ jobs:
             target_name: wii
           - devkit_container: 'devkitpro/devkitppc:latest'
             target_name: wiiu
-          - devkit_container: 'devkitpro/devkita64:latest'
-            target_name: switch
+#          - devkit_container: 'devkitpro/devkita64:latest'
+#            target_name: switch
     runs-on: ubuntu-latest
     container: ${{ matrix.devkit_container }}
     steps:

.github/workflows/ubuntu-build.yml

@@ -7,7 +7,8 @@ jobs:
       matrix:
         build_compiler: [gcc, clang]
         build_type: [release, debug]
-        build_options: [default, link_off, translations_only, libretro]
+#        build_options: [default, link_off, translations_only, libretro]
+        build_options: [default, link_off, translations_only]
         include:
           - cmake_compiler: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++'
             build_compiler: gcc
@@ -21,12 +22,12 @@ jobs:
             build_options: link_off
           - cmake_options: '-DTRANSLATIONS_ONLY=ON'
             build_options: translations_only
-          - libretro_build: 'DEBUG=0'
-            build_type: release
-            build_options: libretro
-          - libretro_build: 'DEBUG=1'
-            build_type: debug
-            build_options: libretro
+#          - libretro_build: 'DEBUG=0'
+#            build_type: release
+#            build_options: libretro
+#          - libretro_build: 'DEBUG=1'
+#            build_type: debug
+#            build_options: libretro
         exclude:
           # Exclude debug/translations_only build
           - build_type: debug
@@ -42,8 +43,13 @@ jobs:
           submodules: recursive
 
       - name: Install Dependencies
-        run: >-
-          bash installdeps; if [ "${{ matrix.build_compiler }}" = clang ]; then sudo apt -y install clang; fi
+        run: |
+          sudo add-apt-repository ppa:hrzhu/sdl3-backport
+          sudo apt update
+          bash installdeps
+          if [ "${{ matrix.build_compiler }}" = clang ]; then
+            sudo apt -y install clang
+          fi
 
       - name: Install xvfb
         run: sudo apt -y install xvfb
@@ -61,9 +67,9 @@ jobs:
         run: sudo ninja -C build install
 
       # Libretro build
-      - if: matrix.build_options == 'libretro'
-        name: Build libretro core
-        run: make -C src/libretro ${{ matrix.libretro_build }}
+#      - if: matrix.build_options == 'libretro'
+#        name: Build libretro core
+#        run: make -C src/libretro ${{ matrix.libretro_build }}
 
       # Run tests
       - if: matrix.build_options == 'default'

.gitignore

@@ -17,3 +17,6 @@ compile_commands.json
 
 # mac finder crap
 *.DS_Store
+
+# online updates header
+src/wx/winsparkle-path.h

.gitlab-ci.yml

@@ -181,7 +181,7 @@ libretro-build-ngc:
   extends:
     - .libretro-ngc-static-retroarch-master
     - .core-defs
-
+    
 # Nintendo Wii
 libretro-build-wii:
   extends:

CHANGELOG.md

@@ -4,6 +4,136 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.2] - 2025-07-30
+
+========================
+* 27acf80b - Make language configurable (requires restart) [andyvand]
+* ae09ab71 - Embed translations for Windows [andyvand]
+* 47a8e7e8 - Update wxWidgets for Mac builder to 3.3.1 [andyvand]
+* 8ce4848d - Fix Wii U VC opcodes [andyvand]
+* dab91fc8 - Fix bigger than 32MB ROM files [andyvand]
+
+## [2.2.1] - 2025-07-19
+=======================
+* 23a3d0b2 - build: fix include paths for bundled SFML [rkitover]
+* 53f5ec7b - build: fix building with OpenAL enabled [rkitover]
+* 3ffbe781 - translations: remove ja_JP, 0% and ja exists [rkitover]
+* ae8bfb4a - Several fixes for windows [danialhorton]
+* bbaf70c0 - build: fix slow CMake vcpkg startup time [rkitover]
+* dca11990 - Fix GBA sound [andyvand]
+* 357eccc6 - build: fix checking if bin pkg host deps installed [rkitover]
+* d0463ddb - Initial tar support [andyvand]
+* a808cfb6 - Update macOS plist [andyvand]
+* 604f5412 - Add LZIP support [andyvand]
+* 6fedbdc5 - Add .xz support [andyvand]
+* 0c91d456 - Add .bz2 file support [andyvand]
+* 3e0541c6 - Update unrar to V7.1.8 [andyvand]
+* 00e48e11 - Fix RAR support [andyvand]
+* 3d8ed512 - Use macOS 10.10 Sparkle [andyvand]
+
+## [2.2.0] - 2025-07-08
+========================
+* 865add06 - Adjust throttle limit 450 -> 1000 [rkitover]
+* 20db9889 - Add dark mode support [andyvand]
+* fac5d565 - build: use vcpkg host pkgconf when cross compiling [rkitover]
+* 5702bc51 - build: fix x64-mingw-static for MSYS2 CLANG64 [rkitover]
+* 5745ed3d - Use external libwebp and use built pcre2 [andyvand]
+* 5f866f85 - Revert beeping fix and fix again the previous way [andyvand]
+* 8002f91c - Fix save dialog [andyvand]
+* cc2bda69 - build: inst host deps for bins only if not [rkitover]
+* d7c6eb81 - Fix MinGW FFMpeg [andyvand]
+* 43a6a90a - Fix FFMPEG for macOS [andyvand]
+* 54f56fc9 - Fix libx265 build for macOS [andyvand]
+* 31cfe304 - Fix MinGW compile with title of DX9 window [andyvand]
+* 2c17201c - Separate window for SDL direct3d9 with background input [andyvand]
+* 6f5c785a - build: add x264+x265 for ffmpeg for macOS [rkitover]
+* 05d18184 - build: rm FindFFmpeg for distro ver, fix x264/x265 [rkitover]
+* 856abf80 - build: add option VCPKG_BINARY_PACKAGES [rkitover]
+* e8d4adaf - build: always use pwsh vcpkg-list [rkitover]
+* 50aa85d9 - build: update vcpkg ports list, drop gettext [rkitover]
+* ce7aa3fa - Fix FAudio crash on Windows debug [andyvand]
+* 4ba7796d - Fix FAudio crash on MSVC [andyvand]
+* 83707cf5 - Fix Direct3D9 [andyvand]
+* b82e7a3b - Update wxvbam.rc [andyvand]
+* f0a30d45 - build: fix installing host build dep bin pkgs [rkitover]
+* 70d6a1ac - Make Sparkle framework optional [andyvand]
+* 77f49ac6 - Clean up WinSparkle code [andyvand]
+* e40c1e71 - Update macOS Sparkle [andyvand]
+* 8579e192 - Check for  kInputBufSize [andyvand]
+* e64a8b69 - Update 7z_C to 2409 and update extractor [andyvand]
+* c31499ca - Fix winsparkle dependency and update win32-deps to latest push [andyvand]
+* 41895eea - Add option not to update vcpkg builds [andyvand]
+* 05f2cb7d - Fix auto updates [andyvand]
+* 61be54d3 - build: avoid using VS vcpkg with elevation [rkitover]
+* 5e2e2ab4 - Add MinGW WinSparkle support [andyvand]
+* 2c2ee701 - build: minor improvements to the Mac builder [rkitover]
+* 3c048f17 - Add alert sound on macOS fix [andyvand]
+* 830c8ccd - Add x264 and x265 to ffmpeg [andyvand]
+* 8ced18c2 - build: make OpenAL-Soft optional again [rkitover]
+* 31ce5d17 - CoreAudio fix [andyvand]
+* ac0dc482 - Fix SDL3 detection [andyvand]
+* 5b9a26ba - build: make some minor CMake improvements [rkitover]
+* 9712c424 - build: make some minor fixes to Mac builder [rkitover]
+* 12f2d88c - Update versions on macOS build script [andyvand]
+* 79d34535 - Implement CoreAudio driver [andyvand]
+* 34e46945 - build: generalize linking openal-soft to libfmt [rkitover]
+* 5529797f - Set directory path for generic file dialog [andyvand]
+* bd0a59cc - ci: fix shell syntax for Ubuntu runner [rkitover]
+* d2762a95 - ci: add libsdl3-dev for Ubuntu runner [rkitover]
+* 1c436f2d - Add MSVC secure library functions [andyvand]
+* 8f47df28 - Add entitlements file for sandboxing [andyvand]
+* db5c890e - Add option for generic file dialogs [andyvand]
+* 7dbad8e8 - translations: transifex pull [rkitover]
+* d3da0492 - Update nixpkgs for SDL3 [andyvand]
+* ef46bb7e - build: in installdeps for SUSE s/libSDL3/SDL3/ [rkitover]
+* a3b92a33 - build: update installdeps to SDL3 [rkitover]
+* 2f92dd73 - Add MSVC 2022 libretro support [andyvand]
+* 07c7bb40 - Fix AVCodec deprecations and fix warnings [andyvand]
+* ed013bd2 - Fix SFML deprecations and fix SFML warnings [andyvand]
+* 116af5c6 - build: replace sdl2 vcpkg port with sdl3 [rkitover]
+* 1788b366 - build: default ENABLE_SDL3=ON in CMake [rkitover]
+* 0820ba58 - BUILDER: Updated core.sh source packages required to build vba-m [zachbacon]
+* f975809e - Update to SDL3 APIs, fix bpps, add SDL audio/video, add Metal video, fix Quartz drawing [andyvand]
+* 18c3c3bd - build: fix link error on MSVC for SFML port [andyvand]
+* 0aecfb5d - build: make minor improvements to the Mac builder [rkitover]
+* dae4397d - build: lower bundled SFML C++17 to C++14 [rkitover]
+* 4cf6cccb - build: bundle SFML 3.x sys/network in third_party [rkitover]
+* 9e724ea4 - build: support building ARM64 binary for Mac [rkitover]
+* eb26ec2e - Enable Hide Status Bar in UI Settings for macOS [rkitover]
+* 6a9eeeae - core.sh Switched to github source for nasm [zachbacon]
+* 9f628584 - initialize sound_buffer_len_ to silence a warning. [danialhorton]
+* e5ad7b34 - build: find_package(nanosvg) w/ vcpkg [rkitover]
+* 94752f83 - [FAudio]Correct the behavior of device_changed check [danialhorton]
+* 8936feaa - build: add libtiff to Nix derivation [rkitover]
+* f93a32ab - build: add libtiff to brews on macOS [rkitover]
+* 3fa850c1 - build: capitalize ARCH_NAME in CMake [rkitover]
+* 364776b8 - build: s/-Ofast/-O3 -ffast-math/ [rkitover]
+* 61394282 - translations: remove dup Chinese translations [rkitover]
+* 29e85e5d - build: update Link SFML usage to SFML 3.x APIs [rkitover]
+* e2283946 - [Input] Process key down event for some controls [steelskin]
+* 3fdc30f7 - Mark `wxEVT_KEY_DOWN` as processed in `wxvbamApp` (#1424) [Steelskin]
+* 2de7efd9 - Reallocate GBA ROM to the new size(#1422) [danialhorton]
+* e4f17d33 - [Sound] Set volume on game startup (#1410) [Steelskin]
+* 2ab707c0 - build: update default.nix [rkitover]
+* 4dba9287 - build: update installdeps for OpenSUSE [rkitover]
+* 44aa859e - build: add cmake var and cpp macro for XP builds [rkitover]
+* 5a2d3a6f - build: set arch to pentium3 not -mmx for XP builds [rkitover]
+* d6b939c4 - Set developer id/component type in metainfo.xml [116445585+PunkPangolin]
+* c6da07fe - build: link avrt for OpenAL on WIN32 [rkitover]
+* 94979eff - build: initialize GTest submodule in CMake [rkitover]
+* dcb9ccca - [gtest] Use googletest as a submodule (#1373) [Steelskin]
+* a8ec85d5 - [GB] Add support for per-game overrides (#1370) [Steelskin]
+* 9d20ce9b - [Input] Reset keyboard tracking on focus loss (#1357) [Steelskin]
+* cdfd37fc - build: rename dependencies submodule -> win32-deps [rkitover]
+* 4f8d0a88 - build: update harfbuzz for macOS builder [rkitover]
+* b22e9fb7 - Ignore illegal opcodes used by Wii U VC (#1351) [Steelskin]
+* 7fa90531 - Disable open menu tracking outside of Windows (#1350) [Steelskin]
+* e1c2ecc5 - [dialogs] Display all controls in AccelConfig on Mac (#1349) [Steelskin]
+* 4c450ab3 - build: fix linking FAudio statically on MINGW [rkitover]
+* d5e1a1f3 - [GB] Properly set OPRI on startup [steelskin]
+* 821b9176 - build: do not use debug libs for RelWithDebInfo [rkitover]
+* 9031103c - build: fix linking non-debug pcre for debug wx [rkitover]
+
 ## [2.1.11] - 2024-09-15 
 
 ==========================

CMakeLists.txt

@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.19)
 cmake_policy(VERSION 3.19...3.28.3)
 
+# Use new link library de-duplication behavior.
+cmake_policy(SET CMP0156 NEW)
+cmake_policy(SET CMP0179 NEW)
+# cmake_policy(SET CMP0181 NEW)
+
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 if(WIN32)
@@ -22,11 +27,16 @@ if(TAG_RELEASE)
     include(MakeReleaseCommitAndTag)
 endif()
 
-set(VCPKG_DEPS pkgconf zlib pthreads "sdl2[samplerate]" gettext wxwidgets)
+option(VCPKG_BINARY_PACKAGES "Use vcpkg binary packages" TRUE)
+
+set(VCPKG_DEPS zlib bzip2 "liblzma[tools]" pthreads gettext-libintl wxwidgets nanosvg)
 
 set(VCPKG_DEPS_OPTIONAL
-    ffmpeg ENABLE_FFMPEG
-    faudio ENABLE_FAUDIO
+    "sdl3[vulkan]"      ENABLE_SDL3
+    "sdl2[samplerate]"  ENABLE_SDL2
+    openal-soft         ENABLE_OPENAL
+    "ffmpeg[x264,x265]" ENABLE_FFMPEG
+    faudio              ENABLE_FAUDIO
 )
 
 include(Set-Toolchain-vcpkg)
@@ -74,6 +84,25 @@ set(CMAKE_C_STANDARD_REQUIRED True)
 
 project(VBA-M C CXX)
 
+if(APPLE)
+    include(CheckLanguage)
+    include(MetalShaderSupport)
+
+    execute_process(
+        COMMAND xcrun -f metal
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE CMAKE_Metal_COMPILER
+    )
+
+    if(NOT CMAKE_Metal_COMPILER)
+        check_language(Metal)
+    endif()
+
+    if(CMAKE_Metal_COMPILER)
+        enable_language(Metal)
+    endif()
+endif()
+
 include(CTest)
 include(FetchContent)
 include(GNUInstallDirs)
@@ -82,6 +111,11 @@ include(Options)
 include(Toolchain)
 include(Dependencies)
 
+# We target Windows XP for 32 bit Windows builds.
+if(WIN32 AND X86)
+    add_compile_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501)
+endif()
+
 # Disable tests when not in a git checkout.
 if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
     set(BUILD_TESTING OFF)
@@ -184,6 +218,16 @@ set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 if(NOT TRANSLATIONS_ONLY)
     add_subdirectory(third_party/include/nonstd)
     add_subdirectory(third_party/include/stb)
+    add_subdirectory(third_party/include/ghc)
+
+    if(ENABLE_LINK)
+        include_directories(third_party/sfml/include)
+        add_subdirectory(third_party/sfml/src/SFML/System  EXCLUDE_FROM_ALL)
+        add_subdirectory(third_party/sfml/src/SFML/Network EXCLUDE_FROM_ALL)
+        set(SFML_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/third_party/sfml/include)
+        set(SFML_LIBRARIES sfml-system sfml-network)
+    endif()
+
     add_subdirectory(src/core)
     add_subdirectory(src/components)
     add_subdirectory(src/sdl)

DEVELOPER-MANUAL.md

@@ -33,6 +33,8 @@ setup guides.
 
 Follow the following steps to process newly submitted issues:
 
+- Edit the user's post to remove any links to illegal content such as ROM files.
+
 - Edit the user's post to remove unused template sections etc.. Rephrase the
   issue title if it needs to be clarified.
 
@@ -48,13 +50,13 @@ Follow the following steps to process newly submitted issues:
 
 #### Resolving Issues
 
-- An issue is resolved by closing it in github. A commit that fixes the issue
+- An issue is resolved by closing it in GitHub. A commit that fixes the issue
   should have the following line near the end of the body of the commit message:
 ```
 Fix #999.
 ```
   This will automatically close the issue and assign the closing commit in the
-  github metadata when it is merged to master. The issue can be reopened if
+  GitHub metadata when it is merged to master. The issue can be reopened if
   needed.
 
 - A commit that is work towards resolving an issue, should have the issue number
@@ -83,13 +85,8 @@ A commit message must always have a title and a description, the description
 must be independent of the title line, if necessary repeat the information in
 the title line in the description.
 
-Make sure the git history in your branch is clean and logical, edit when
-necessary with `rebase -i`.
-
-Use one commit per logical change if necessary, most work can be squashed into
-one commit when you are done. It is not necessary to have separate commits
-per-file if they are one logical change. We are less strict about this than
-other projects, fewer is better.
+The commit message must **ALL** changes, unless it's a minor refactor or
+white space change or something and is not important.
 
 The commit title line should be prefixed with an area, unless it involves the
 wxWidgets GUI app, in which case it should **NOT** have a prefix.
@@ -102,14 +99,15 @@ The text after the area prefix should not be capitalized.
 
 Please use one of these area prefixes for non-main-GUI-app commits:
 
-- doc: documentation, README.md etc.
-- build: cmake, installdeps, preprocessor compatibility defines, compatibility
-  headers, etc.
-- gb: the GameBoy emulator core
-- gba: the GameBoy Advance emulator core
-- libretro: the libretro core glue and build
-- sdl: anything for the SDL port
-- translations: anything related to translations
+- doc: documentation, README.md etc..
+- build: CMake, installdeps, preprocessor compatibility defines, compatibility
+  headers, macOS build system etc..
+- gb: the GameBoy emulator core or changes related to it.
+- gba: the GameBoy Advance emulator core or changes related to it.
+- libretro: the libretro core glue and build.
+- sdl: anything for the SDL port, but **NOT** SDL functionality in the wxWidgets
+  GUI app.
+- translations: anything related to translations.
 
 . Add other areas here if needed.
 
@@ -118,21 +116,85 @@ If a commit fixes a regression, use a title line such as:
 ```console
 Fix regression <PROBLEM> in <SHORT-SHA>
 ```
-, you can get the short sha from `git log --oneline -100` or similar.
+, you can get the short SHA from `git log --oneline -100` or similar.
 
 The commit description for a regression must refer to the breaking change in
 reference format, which you can get from e.g. `git log --format=reference -20`.
 
-You can refer to github issues using `#<ISSUE-NUMBER>` freely in the description
-text.
+#### Working on Pull Requests
 
-If a commit fixes an issue, add a line at the end of the description such as:
+When opening a pull request, push your branch to our repository if you were
+given access, or a branch in your fork if you have not yet been given access. Do
+**NOT** use `master`, use a specific branch.
 
-```console
-Fix #<ISSUE-NUMBER>.
+If you are using a fork, set up your workflow like this:
+
+```bash
+git clone git@github.com:visualboyadvance-m/visualboyadvance-m
+git remote add fork git@github.com:<your-GitHub-user>/visualboyadvance-m
+git fetch --all --prune
+git checkout -b your-work-branch-name
+git commit -a --verbose --signoff -S
 ```
 .
 
+The `-S` flags tells Git to sign your commit with GnuPG. If you do not have a
+GnuPG key, you will need to create one and upload it to a keyserver. I recommend
+removing the password on your private key to not deal with `gpg-agent` and all
+of this stuff.
+
+All of this works fine on Windows, just install `GnuPG.GnuPG` from WinGet.
+
+Your first push will then be:
+
+```bash
+git push -u fork HEAD
+```
+.
+
+Subsequent commits will then be:
+
+```bash
+git commit -a --verbose --amend --reset-author --signoff -S
+git push -f
+```
+
+. If you are a project member, then the workflow will be roughly:
+
+```bash
+git clone git@github.com:visualboyadvance-m/visualboyadvance-m
+git fetch --all --prune
+git checkout -b your-work-branch-name
+git commit -a --verbose --signoff -S
+```
+
+. Your first push will be:
+
+```bash
+git push -u origin HEAD
+```
+
+. And subsequent pushes will be:
+
+```bash
+git commit -a --verbose --signoff -S --amend --reset-author
+git push -f
+```
+
+. Please push frequently so that we can track your progress and review it.
+
+Make sure the git history in your branch is clean and logical, edit when
+necessary with `rebase -i`. In most cases a single commit with all of the
+changes will be good. Sometimes you may want to split it up into multiple
+logical commits for a large work, but a single commit is also fine if the title
+line encapsulates all of the work for the changelog.
+
+See the previous section on how to write commit messages.
+
+If you are using Windows as your development environment, I recommend reading my
+manual on Windows development environments
+[here](https://github.com/rkitover/windows-dev-guide).
+
 #### Collaboration on a Branch
 
 To update when multiple people are working on a git branch, keep a couple of
@@ -142,23 +204,32 @@ things in mind:
   better to edit the history than to add more commits. Never add commits fixing
   previous commits, only improving or adding to them.
 
-- To update when someone else updated the branch with a `push -f`
+- To update when someone else updated the branch with a `git push -f`:
+
 ```bash
 git status # should be clean, with your work having been already pushed
 git fetch --all --prune
-git reset --hard origin/<branch-name>
+git reset --hard origin/<work-branch-name>
 ```
 .
 
-- While actively working on a branch, keep it rebased on top of master.
+- While actively working on a branch, keep it rebased on top of master, like
+  this:
 
-#### Commits from Maintainers
+```bash
+git fetch --all --prune
+git rebase origin/master
+git push -f
+```
+
+. You may sometimes need to fix conflicts, follow the instructions.
+
+#### Commits from Admins
 
 Maintainers and project members have the power to commit directly to master.
 This power must be used responsibly.
 
-Make your best attempt to follow these general guidelines to keep our
-history clean:
+Make your best attempt to follow these general guidelines:
 
 - Things that are a minor fix or improvement that does not require discussion
   can be committed directly, keeping the following guidelines in mind.
@@ -166,19 +237,34 @@ history clean:
 - Bigger new features, code refactors and changes in architecture should go
   through the PR process.
 
+- Absolutely **NEVER** `git push -f` on `master`. If you make a mistake, revert
+  or push a fix commit.
+
 - Push code changes to a branch first, so they can run through the CI. When you
   open the commit in GitHub there is a little icon in the upper left corner that
   shows the CI status for this commit. Differences in what different compilers
   allow is a problem that comes up **VERY** frequently. As well as
   incompatibilities between different configurations for both the C++ code and
-  any supporting code.
+  any supporting code. Once the CI is clear, you can merge your branch like
+  this:
+
+```bash
+git push -f
+git checkout master
+git merge --ff-only <your-work-branch-name>
+git push
+git branch -D <your-work-branch-name>
+git push origin ':refs/heads/your-work-branch-nbame'
+```
+
+. The last line there deletes the branch in our repository.
 
 ### Miscellaneous
 
 #### Debug Messages
 
 We have an override for `wxLogDebug()` to make it work even in non-debug builds
-of wx and on windows, even in mintty.
+of wxWidgets and on windows, even in mintty.
 
 It works like `printf()`, e.g.:
 
@@ -195,7 +281,7 @@ fprintf(stderr, "...", ...);
 , will work fine.
 
 You need a debug build for this to work or to even have a console on Windows.
-Pass `-DCMAKE_BUILD_TYPE=Debug` to cmake.
+Pass `-DCMAKE_BUILD_TYPE=Debug` to CMake.
 
 ### Release Process
 

README.md

@@ -166,7 +166,7 @@ And the following development libraries:
 - [ffmpeg](https://ffmpeg.org/) (optional, at least version `4.0.4`, for game recording)
 - [gettext](https://www.gnu.org/software/gettext/) and gettext-tools
 - [SDL2](https://www.libsdl.org/) (required)
-- [openal-soft](https://kcat.strangesoft.net/openal.html) (required, a sound interface)
+- [openal-soft](https://kcat.strangesoft.net/openal.html) (optional, a sound interface)
 - [wxWidgets](https://wxwidgets.org/) (required for GUI, 2.8 and non-stl builds are no longer supported)
 
 On Linux and similar, you also need the version of GTK your wxWidgets is linked
@@ -216,6 +216,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_LINK=NO -G Ninja
 | `ENABLE_ONLINEUPDATES`  | Enable online update checks                                          | ON                    |
 | `ENABLE_LTO`            | Compile with Link Time Optimization (gcc and clang only)             | ON for release build  |
 | `ENABLE_GBA_LOGGING`    | Enable extended GBA logging                                          | ON                    |
+| `ENABLE_OPENAL`         | Enable openal-soft sound output for wxWidgets                        | ON, not 32 bit Win    |
 | `ENABLE_XAUDIO2`        | Enable xaudio2 sound output for wxWidgets (Windows only)             | ON                    |
 | `ENABLE_FAUDIO`         | Enable faudio sound output for wxWidgets,                            | ON, not 32 bit Win    |
 | `ENABLE_ASAN`           | Enable libasan sanitizers (by default address, only in debug mode)   | OFF                   |

cmake/Architecture.cmake

@@ -31,6 +31,15 @@ elseif(VCPKG_TARGET_TRIPLET MATCHES "^[aA][rR][mM]-")
     set(CMAKE_SYSTEM_PROCESSOR ARM)
 endif()
 
+if(APPLE AND
+  (CMAKE_OSX_ARCHITECTURES MATCHES "[xX]86_64") OR
+  (ENV{CFLAGS}             MATCHES "[xX]86_64") OR
+  (ENV{CXXFLAGS}           MATCHES "[xX]86_64") OR
+  (ENV{LDFLAGS}            MATCHES "[xX]86_64"))
+
+  set(CMAKE_SYSTEM_PROCESSOR "x86_64")
+endif()
+
 # Turn asm on by default on 32bit x86 and set WINARCH for windows stuff.
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
     if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
@@ -46,14 +55,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
         set(WINARCH x64)
         set(ARCH_NAME x86_64)
     endif()
-
-    if(DEFINED VCPKG_TARGET_TRIPLET)
-        string(REGEX MATCH "^x[86][64]" target_arch ${VCPKG_TARGET_TRIPLET})
-
-        if(NOT WINARCH STREQUAL target_arch)
-            message(FATAL_ERROR "Wrong build environment architecture for VCPKG_TARGET_TRIPLET, you specified ${target_arch} but your compiler is for ${WINARCH}")
-        endif()
-    endif()
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]")
     if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
         set(ARM32 ON)
@@ -70,6 +71,14 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "[aA][aA][rR][cC][hH]|[aA][rR][mM]")
     endif()
 endif()
 
+if(DEFINED VCPKG_TARGET_TRIPLET)
+    string(REGEX MATCH "^[^-]+" target_arch ${VCPKG_TARGET_TRIPLET})
+
+    if(NOT WINARCH STREQUAL target_arch)
+        message(FATAL_ERROR "Wrong build environment architecture for VCPKG_TARGET_TRIPLET, you specified ${target_arch} but your compiler is for ${WINARCH}")
+    endif()
+endif()
+
 # We do not support amd64 asm yet
 if(X86_64 AND (ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS OR ENABLE_MMX))
     message(FATAL_ERROR "The options ASM_CORE, ASM_SCALERS and MMX are not supported on X86_64 yet.")

cmake/CMakeDetermineMetalCompiler.cmake

@@ -0,0 +1,85 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+# CMakeDetermine(LANG)Compiler.cmake -> this should find the compiler for LANG and configure CMake(LANG)Compiler.cmake.in
+
+include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
+
+if(NOT CMAKE_Metal_COMPILER_NAMES)
+    set(CMAKE_Metal_COMPILER_NAMES metal)
+endif()
+
+if("${CMAKE_GENERATOR}" STREQUAL "Xcode")
+    set(CMAKE_Metal_COMPILER_XCODE_TYPE sourcecode.metal)
+
+    execute_process(COMMAND xcrun --find metal
+        OUTPUT_VARIABLE _xcrun_out OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE _xcrun_err RESULT_VARIABLE _xcrun_result
+    )
+
+    if(_xcrun_result EQUAL 0 AND EXISTS "${_xcrun_out}")
+        set(CMAKE_Metal_COMPILER "${_xcrun_out}")
+    else()
+        _cmake_find_compiler_path(Metal)
+    endif()
+else()
+    if(CMAKE_Metal_COMPILER)
+        _cmake_find_compiler_path(Metal)
+    else()
+        set(CMAKE_Metal_COMPILER_INIT NOTFOUND)
+
+        if(NOT $ENV{METALC} STREQUAL "")
+            get_filename_component(CMAKE_Metal_COMPILER_INIT $ENV{METALC} PROGRAM PROGRAM_ARGS CMAKE_Metal_FLAGS_ENV_INIT)
+            if(CMAKE_Metal_FLAGS_ENV_INIT)
+                set(CMAKE_Metal_COMPILER_ARG1 "${CMAKE_Metal_FLAGS_ENV_INIT}" CACHE STRING "Arguments to the Metal compiler")
+            endif()
+            if(NOT EXISTS ${CMAKE_Metal_COMPILER_INIT})
+                message(FATAL_ERROR "Could not find compiler set in environment variable METALC\n$ENV{METALC}.\n${CMAKE_Metal_COMPILER_INIT}")
+            endif()
+        endif()
+
+        if(NOT CMAKE_Metal_COMPILER_INIT)
+            set(CMAKE_Metal_COMPILER_LIST metal ${_CMAKE_TOOLCHAIN_PREFIX}metal)
+        endif()
+
+        _cmake_find_compiler(Metal)
+    endif()
+
+    mark_as_advanced(CMAKE_Metal_COMPILER)
+endif()
+
+# For Metal we need to explicitly query the version.
+if(CMAKE_Metal_COMPILER AND NOT CMAKE_Metal_COMPILER_VERSION)
+    execute_process(
+        COMMAND "${CMAKE_Metal_COMPILER}" --version
+        OUTPUT_VARIABLE output ERROR_VARIABLE output
+        RESULT_VARIABLE result
+        TIMEOUT 10
+    )
+    message(CONFIGURE_LOG
+        "Running the Metal compiler: \"${CMAKE_Metal_COMPILER}\" --version\n"
+        "${output}\n"
+    )
+
+    if(output MATCHES [[metal version ([0-9]+\.[0-9]+(\.[0-9]+)?)]])
+        set(CMAKE_Metal_COMPILER_VERSION "${CMAKE_MATCH_1}")
+        if(NOT CMAKE_Metal_COMPILER_ID)
+            set(CMAKE_Metal_COMPILER_ID "Apple")
+        endif()
+    endif()
+endif()
+
+if(NOT _CMAKE_TOOLCHAIN_LOCATION)
+    get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_Metal_COMPILER}" PATH)
+endif ()
+
+set(_CMAKE_PROCESSING_LANGUAGE "Metal")
+include(CMakeFindBinUtils)
+unset(_CMAKE_PROCESSING_LANGUAGE)
+
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/CMakeMetalCompiler.cmake.in
+    ${CMAKE_PLATFORM_INFO_DIR}/CMakeMetalCompiler.cmake
+)
+
+set(CMAKE_Metal_COMPILER_ENV_VAR "METALC")

cmake/CMakeMetalCompiler.cmake.in

@@ -0,0 +1,27 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+# CMake(LANG)Compiler.cmake.in  -> used by CMakeDetermine(LANG)Compiler.cmake
+# This file is used to store compiler information and is copied down into try
+# compile directories so that try compiles do not need to re-determine and test
+# the LANG
+
+set(CMAKE_Metal_COMPILER "@CMAKE_Metal_COMPILER@")
+set(CMAKE_Metal_COMPILER_ID "@CMAKE_Metal_COMPILER_ID@")
+set(CMAKE_Metal_COMPILER_VERSION "@CMAKE_Metal_COMPILER_VERSION@")
+
+set(CMAKE_Metal_COMPILER_LOADED 1)
+set(CMAKE_Metal_COMPILER_WORKS "@CMAKE_Metal_COMPILER_WORKS@")
+
+set(CMAKE_Metal_COMPILER_ENV_VAR "METALC")
+
+set(CMAKE_Metal_COMPILER_ID_RUN "@CMAKE_Metal_COMPILER_ID_RUN@")
+set(CMAKE_Metal_SOURCE_FILE_EXTENSIONS metal)
+set(CMAKE_Metal_OUTPUT_EXTENSION ".air")
+set(CMAKE_STATIC_LIBRARY_PREFIX_Metal "")
+set(CMAKE_STATIC_LIBRARY_SUFFIX_Metal ".metal-ar")
+set(CMAKE_SHARED_LIBRARY_PREFIX_Metal "")
+set(CMAKE_SHARED_LIBRARY_SUFFIX_Metal ".metallib")
+set(CMAKE_SHARED_MODULE_PREFIX_Metal "")
+set(CMAKE_SHARED_MODULE_SUFFIX_Metal ".metallib")
+set(CMAKE_EXECUTABLE_SUFFIX_Metal ".metallib")

cmake/CMakeMetalInformation.cmake

@@ -0,0 +1,85 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+#  CMake(LANG)Information.cmake  -> set up rule variables for LANG :
+#    CMAKE_(LANG)_CREATE_SHARED_LIBRARY
+#    CMAKE_(LANG)_CREATE_SHARED_MODULE
+#    CMAKE_(LANG)_CREATE_STATIC_LIBRARY
+#    CMAKE_(LANG)_COMPILE_OBJECT
+#    CMAKE_(LANG)_LINK_EXECUTABLE
+
+include(CMakeCommonLanguageInclude)
+
+set(CMAKE_Metal_FLAGS_INIT "-ffast-math")
+set(CMAKE_Metal_FLAGS_DEBUG_INIT "-gline-tables-only -frecord-sources")
+set(CMAKE_Metal_FLAGS_RELWITHDEBINFO_INIT "-gline-tables-only -frecord-sources")
+
+cmake_initialize_per_config_variable(CMAKE_Metal_FLAGS "Flags used by the Metal compiler")
+
+set(CMAKE_INCLUDE_FLAG_Metal "-I ")
+set(CMAKE_Metal_COMPILER_ARG1 "")
+set(CMAKE_Metal_DEFINE_FLAG -D)
+set(CMAKE_Metal_FRAMEWORK_SEARCH_FLAG "-F ")
+set(CMAKE_Metal_LIBRARY_PATH_FLAG "-L ")
+set(CMAKE_Metal_SYSROOT_FLAG "-isysroot")
+set(CMAKE_Metal_COMPILE_OPTIONS_TARGET "-target ")
+set(CMAKE_DEPFILE_FLAGS_Metal "-MMD -MT dependencies -MF <DEP_FILE>")
+
+if(CMAKE_GENERATOR MATCHES "Makefiles")
+    set(CMAKE_Metal_DEPFILE_FORMAT gcc)
+    set(CMAKE_Metal_DEPENDS_USE_COMPILER TRUE)
+endif()
+
+set(CMAKE_Metal_COMPILER_PREDEFINES_COMMAND "${CMAKE_Metal_COMPILER}")
+if(CMAKE_Metal_COMPILER_TARGET)
+    list(APPEND CMAKE_Metal_COMPILER_PREDEFINES_COMMAND "-target" "${CMAKE_Metal_COMPILER_TARGET}")
+endif()
+
+# now define the following rule variables
+
+# CMAKE_Metal_CREATE_SHARED_LIBRARY
+# CMAKE_Metal_CREATE_SHARED_MODULE
+# CMAKE_Metal_COMPILE_OBJECT
+# CMAKE_Metal_LINK_EXECUTABLE
+
+# variables supplied by the generator at use time
+# <TARGET>
+# <TARGET_BASE> the target without the suffix
+# <OBJECTS>
+# <OBJECT>
+# <LINK_LIBRARIES>
+# <FLAGS>
+# <LINK_FLAGS>
+
+# Metal compiler information
+# <CMAKE_Metal_COMPILER>
+# <CMAKE_SHARED_LIBRARY_CREATE_Metal_FLAGS>
+# <CMAKE_SHARED_MODULE_CREATE_Metal_FLAGS>
+# <CMAKE_Metal_LINK_FLAGS>
+
+if(NOT CMAKE_Metal_COMPILE_OBJECT)
+  set(CMAKE_Metal_COMPILE_OBJECT
+      "<CMAKE_Metal_COMPILER> -c <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>"
+  )
+endif()
+
+if(NOT CMAKE_Metal_CREATE_SHARED_LIBRARY)
+    set(CMAKE_Metal_CREATE_SHARED_LIBRARY
+        "<CMAKE_Metal_COMPILER> <CMAKE_SHARED_LIBRARY_Metal_FLAGS> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Metal_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
+    )
+endif()
+
+if(NOT CMAKE_Metal_CREATE_SHARED_MODULE)
+    set(CMAKE_Metal_CREATE_SHARED_MODULE
+        "${CMAKE_Metal_CREATE_SHARED_LIBRARY}"
+    )
+endif()
+
+if(NOT CMAKE_Metal_LINK_EXECUTABLE)
+    # Metal shaders don't really have "executables", but we need this for the try_compile to work properly, so we'll just have it output a metallib file
+    set(CMAKE_Metal_LINK_EXECUTABLE
+        "<CMAKE_Metal_COMPILER> <FLAGS> <CMAKE_Metal_LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
+    )
+endif()
+
+set(CMAKE_Metal_INFORMATION_LOADED 1)

cmake/CMakeTestMetalCompiler.cmake

@@ -0,0 +1,78 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+# CMakeTest(LANG)Compiler.cmake -> test the compiler and set:
+#     SET(CMAKE_(LANG)_COMPILER_WORKS 1 CACHE INTERNAL "")
+
+if(CMAKE_Metal_COMPILER_FORCED)
+    # The compiler configuration was forced by the user.
+    # Assume the user has configured all compiler information.
+    set(CMAKE_Metal_COMPILER_WORKS TRUE)
+    return()
+endif()
+
+include(CMakeTestCompilerCommon)
+
+if("${CMAKE_GENERATOR}" STREQUAL "Xcode")
+    if(XCODE_VERSION VERSION_GREATER 7.0)
+        set(CMAKE_Metal_COMPILER_WORKS 1)
+    endif()
+endif()
+
+# This file is used by EnableLanguage in cmGlobalGenerator to
+# determine that that selected Metal compiler can actually compile
+# and link the most basic of programs.   If not, a fatal error
+# is set and cmake stops processing commands and will not generate
+# any makefiles or projects.
+if(NOT CMAKE_Metal_COMPILER_WORKS)
+    PrintTestCompilerStatus("Metal")
+    __TestCompiler_setTryCompileTargetType()
+
+    string(CONCAT __TestCompiler_testMetalCompilerSource
+        "#ifndef __METAL_VERSION__\n"
+        "# error \"The CMAKE_Metal_COMPILER is not a Metal compiler\"\n"
+        "#endif\n"
+        "#import <metal_stdlib>\n"
+        "using namespace metal;\n"
+    )
+
+    # Clear result from normal variable.
+    unset(CMAKE_Metal_COMPILER_WORKS)
+
+    # Puts test result in cache variable.
+    try_compile(CMAKE_Metal_COMPILER_WORKS
+        SOURCE_FROM_VAR testMetalCompiler.metal __TestCompiler_testMetalCompilerSource
+        OUTPUT_VARIABLE __CMAKE_Metal_COMPILER_OUTPUT
+    )
+    unset(__TestCompiler_testMetalCompilerSource)
+
+    # Move result from cache to normal variable.
+    set(CMAKE_Metal_COMPILER_WORKS ${CMAKE_Metal_COMPILER_WORKS})
+    unset(CMAKE_Metal_COMPILER_WORKS CACHE)
+    __TestCompiler_restoreTryCompileTargetType()
+    set(METAL_TEST_WAS_RUN 1)
+endif()
+
+if(NOT CMAKE_Metal_COMPILER_WORKS)
+    PrintTestCompilerResult(CHECK_FAIL "broken")
+    string(REPLACE "\n" "\n  " _output "${__CMAKE_Metal_COMPILER_OUTPUT}")
+    message(FATAL_ERROR "The Metal compiler\n  \"${CMAKE_Metal_COMPILER}\"\n"
+        "is not able to compile a simple test program.\nIt fails "
+        "with the following output:\n  ${_output}\n\n"
+        "CMake will not be able to correctly generate this project."
+    )
+else()
+    if(METAL_TEST_WAS_RUN)
+        PrintTestCompilerResult(CHECK_PASS "works")
+    endif()
+
+    # Re-configure to save learned information.
+    configure_file(
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeMetalCompiler.cmake.in
+        ${CMAKE_PLATFORM_INFO_DIR}/CMakeMetalCompiler.cmake
+        @ONLY
+    )
+    include(${CMAKE_PLATFORM_INFO_DIR}/CMakeMetalCompiler.cmake)
+endif()
+
+unset(__CMAKE_Metal_COMPILER_OUTPUT)

cmake/CheckLanguage.cmake

@@ -0,0 +1,169 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+CheckLanguage
+-------------
+
+Check whether a language can be enabled by the :command:`enable_language`
+or :command:`project` commands:
+
+.. command:: check_language
+
+  .. code-block:: cmake
+
+    check_language(<lang>)
+
+  Try enabling language ``<lang>`` in a test project and record results
+  in the cache:
+
+  :variable:`CMAKE_<LANG>_COMPILER`
+    If the language can be enabled, this variable is set to the compiler
+    that was found.  If the language cannot be enabled, this variable is
+    set to ``NOTFOUND``.
+
+    If this variable is already set, either explicitly or cached by
+    a previous call, the check is skipped.
+
+  :variable:`CMAKE_<LANG>_HOST_COMPILER`
+    This variable is set when ``<lang>`` is ``CUDA`` or ``HIP``.
+
+    If the check detects an explicit host compiler that is required for
+    compilation, this variable will be set to that compiler.
+    If the check detects that no explicit host compiler is needed,
+    this variable will be cleared.
+
+    If this variable is already set, its value is preserved only if
+    :variable:`CMAKE_<LANG>_COMPILER` is also set.
+    Otherwise, the check runs and overwrites
+    :variable:`CMAKE_<LANG>_HOST_COMPILER` with a new result.
+    Note that :variable:`CMAKE_<LANG>_HOST_COMPILER` documents it should
+    not be set without also setting
+    :variable:`CMAKE_<LANG>_COMPILER` to a NVCC compiler.
+
+  :variable:`CMAKE_<LANG>_PLATFORM <CMAKE_HIP_PLATFORM>`
+    This variable is set to the detected GPU platform when ``<lang>`` is ``HIP``.
+
+    If the variable is already set its value is always preserved. Only compatible values
+    will be considered for :variable:`CMAKE_<LANG>_COMPILER`.
+
+For example:
+
+.. code-block:: cmake
+
+  check_language(Fortran)
+  if(CMAKE_Fortran_COMPILER)
+    enable_language(Fortran)
+  else()
+    message(STATUS "No Fortran support")
+  endif()
+#]=======================================================================]
+
+# This file has been modified to take into account the CMAKE_MODULES path when trying to build the test project
+# Ref https://gitlab.kitware.com/cmake/cmake/-/issues/26020
+# This was merged in to CMake 3.30.0, so we only need this for older versions
+
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.30)
+    include(${CMAKE_ROOT}/Modules/CheckLanguage.cmake)
+else()
+    include_guard(GLOBAL)
+
+    block(SCOPE_FOR POLICIES)
+    cmake_policy(SET CMP0126 NEW)
+
+    macro(check_language lang)
+      if(NOT DEFINED CMAKE_${lang}_COMPILER)
+        set(_desc "Looking for a ${lang} compiler")
+        message(CHECK_START "${_desc}")
+        file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang})
+
+        set(extra_compiler_variables)
+        if("${lang}" MATCHES "^(CUDA|HIP)$" AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+          set(extra_compiler_variables "set(CMAKE_${lang}_HOST_COMPILER \\\"\${CMAKE_${lang}_HOST_COMPILER}\\\")")
+        endif()
+
+        if("${lang}" STREQUAL "HIP")
+          list(APPEND extra_compiler_variables "set(CMAKE_${lang}_PLATFORM \\\"\${CMAKE_${lang}_PLATFORM}\\\")")
+        endif()
+
+        list(TRANSFORM extra_compiler_variables PREPEND "\"")
+        list(TRANSFORM extra_compiler_variables APPEND "\\n\"")
+        list(JOIN extra_compiler_variables "\n  " extra_compiler_variables)
+
+        set(_cl_content
+          "cmake_minimum_required(VERSION ${CMAKE_VERSION})
+    set(CMAKE_MODULE_PATH \"${CMAKE_MODULE_PATH}\")
+    project(Check${lang} ${lang})
+    file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
+      \"set(CMAKE_${lang}_COMPILER \\\"\${CMAKE_${lang}_COMPILER}\\\")\\n\"
+      ${extra_compiler_variables}
+      )"
+        )
+
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}/CMakeLists.txt"
+          "${_cl_content}")
+        if(CMAKE_GENERATOR_INSTANCE)
+          set(_D_CMAKE_GENERATOR_INSTANCE "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${CMAKE_GENERATOR_INSTANCE}")
+        else()
+          set(_D_CMAKE_GENERATOR_INSTANCE "")
+        endif()
+        if(CMAKE_GENERATOR MATCHES "^(Xcode$|Green Hills MULTI$|Visual Studio)")
+          set(_D_CMAKE_MAKE_PROGRAM "")
+        else()
+          set(_D_CMAKE_MAKE_PROGRAM "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}")
+        endif()
+        if(CMAKE_TOOLCHAIN_FILE)
+          set(_D_CMAKE_TOOLCHAIN_FILE "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}")
+        else()
+          set(_D_CMAKE_TOOLCHAIN_FILE "")
+        endif()
+        if(CMAKE_${lang}_PLATFORM)
+          set(_D_CMAKE_LANG_PLATFORM "-DCMAKE_${lang}_PLATFORM:STRING=${CMAKE_${lang}_PLATFORM}")
+        else()
+          set(_D_CMAKE_LANG_PLATFORM "")
+        endif()
+        execute_process(
+          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}
+          COMMAND ${CMAKE_COMMAND} . -G ${CMAKE_GENERATOR}
+                                     -A "${CMAKE_GENERATOR_PLATFORM}"
+                                     -T "${CMAKE_GENERATOR_TOOLSET}"
+                                     ${_D_CMAKE_GENERATOR_INSTANCE}
+                                     ${_D_CMAKE_MAKE_PROGRAM}
+                                     ${_D_CMAKE_TOOLCHAIN_FILE}
+                                     ${_D_CMAKE_LANG_PLATFORM}
+          OUTPUT_VARIABLE _cl_output
+          ERROR_VARIABLE _cl_output
+          RESULT_VARIABLE _cl_result
+          )
+        include(${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}/result.cmake OPTIONAL)
+        if(CMAKE_${lang}_COMPILER AND "${_cl_result}" STREQUAL "0")
+          message(CONFIGURE_LOG
+            "${_desc} passed with the following output:\n"
+            "${_cl_output}\n")
+          set(_CHECK_COMPILER_STATUS CHECK_PASS)
+        else()
+          set(CMAKE_${lang}_COMPILER NOTFOUND)
+          set(_CHECK_COMPILER_STATUS CHECK_FAIL)
+          message(CONFIGURE_LOG
+            "${_desc} failed with the following output:\n"
+            "${_cl_output}\n")
+        endif()
+        message(${_CHECK_COMPILER_STATUS} "${CMAKE_${lang}_COMPILER}")
+        set(CMAKE_${lang}_COMPILER "${CMAKE_${lang}_COMPILER}" CACHE FILEPATH "${lang} compiler")
+        mark_as_advanced(CMAKE_${lang}_COMPILER)
+
+        if(CMAKE_${lang}_HOST_COMPILER)
+          message(STATUS "Looking for a ${lang} host compiler - ${CMAKE_${lang}_HOST_COMPILER}")
+          set(CMAKE_${lang}_HOST_COMPILER "${CMAKE_${lang}_HOST_COMPILER}" CACHE FILEPATH "${lang} host compiler")
+          mark_as_advanced(CMAKE_${lang}_HOST_COMPILER)
+        endif()
+
+        if(CMAKE_${lang}_PLATFORM)
+          set(CMAKE_${lang}_PLATFORM "${CMAKE_${lang}_PLATFORM}" CACHE STRING "${lang} platform")
+          mark_as_advanced(CMAKE_${lang}_PLATFORM)
+        endif()
+      endif()
+    endmacro()
+
+    endblock()
+endif()

cmake/Dependencies.cmake

@@ -11,12 +11,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
     set(OpenGL_GL_PREFERENCE LEGACY)
 endif()
 
-find_package(OpenGL REQUIRED)
-find_package(SDL2   REQUIRED)
+if(NOT DISABLE_OPENGL)
+    find_package(OpenGL)
+
+    if(NOT OpenGL_FOUND)
+        set(CMAKE_C_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_C_FLAGS}")
+        set(CMAKE_CXX_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_CXX_FLAGS}")
+    endif()
+endif()
 
 # Add libsamplerate to SDL2 with vcpkg
-unset(SDL2_LIBRARY_TEMP)
-if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+unset(SDL_LIBRARY_TEMP)
+if((NOT ENABLE_SDL3) AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
     if(WIN32)
         unset(arch_suffix)
         unset(path_prefix)
@@ -26,18 +32,37 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
             set(path_prefix debug)
         endif()
-        set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
 
-        SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${installed_prefix}/lib/samplerate.lib)
+        set(samplerate_lib_name samplerate)
+        set(installed_prefix    ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
+
+        if(MINGW)
+            set(installed_prefix    ${_VCPKG_INSTALLED_DIR}/${WINARCH}-mingw${arch_suffix}/${path_prefix})
+            set(samplerate_lib_name lib${samplerate_lib_name})
+        endif()
+
+        SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "${installed_prefix}/lib/${samplerate_lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
     else()
-        SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} -lsamplerate)
+        SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} -lsamplerate)
     endif()
 endif()
 
-if(VBAM_STATIC)
-    set(VBAM_SDL2_LIBS SDL2::SDL2-static ${SDL2_LIBRARY_TEMP})
+if(ENABLE_SDL3)
+    if(UNIX AND NOT APPLE)
+        set(VBAM_SDL_LIBS "${SDL3_LIBRARIES}")
+    else()
+        if(VBAM_STATIC)
+            set(VBAM_SDL_LIBS SDL3::SDL3-static ${SDL_LIBRARY_TEMP})
+        else()
+            set(VBAM_SDL_LIBS SDL3::SDL3        ${SDL_LIBRARY_TEMP})
+        endif()
+    endif()
 else()
-    set(VBAM_SDL2_LIBS SDL2::SDL2        ${SDL2_LIBRARY_TEMP})
+    if(VBAM_STATIC)
+        set(VBAM_SDL_LIBS SDL2::SDL2-static ${SDL_LIBRARY_TEMP})
+    else()
+        set(VBAM_SDL_LIBS SDL2::SDL2        ${SDL_LIBRARY_TEMP})
+    endif()
 endif()
 
 if(ENABLE_FFMPEG)
@@ -49,7 +74,7 @@ if(ENABLE_FFMPEG)
         list(APPEND FFMPEG_LDFLAGS "SHELL:-framework CoreText" "SHELL:-framework ApplicationServices")
 
         if(UPSTREAM_RELEASE)
-            list(APPEND FFMPEG_LDFLAGS -lbz2 -ltiff "SHELL:-framework DiskArbitration" -lfreetype -lfontconfig -llzma -lxml2 -lharfbuzz)
+            list(APPEND FFMPEG_LDFLAGS -lbz2 -ltiff "SHELL:-framework DiskArbitration" -lfreetype -lfontconfig -llzma -lxml2 -lharfbuzz -lcrypto -lssl)
         endif()
     elseif(WIN32)
         set(WIN32_MEDIA_FOUNDATION_LIBS dxva2 evr mf mfplat mfplay mfreadwrite mfuuid amstrmid)
@@ -119,10 +144,3 @@ if(ENABLE_LINK OR ENABLE_WX)
         message(FATAL_ERROR "NLS requires libintl/gettext")
     endif()
 endif()
-
-if(ENABLE_LINK)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/third_party/sfml/src/SFML/System  EXCLUDE_FROM_ALL)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/third_party/sfml/src/SFML/Network EXCLUDE_FROM_ALL)
-    set(SFML_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/third_party/sfml/include)
-    set(SFML_LIBRARIES sfml-system sfml-network)
-endif()

cmake/FindFFmpeg.cmake

@@ -33,7 +33,7 @@ include(FindPackageHandleStandardArgs)
 
 # The default components were taken from a survey over other FindFFMPEG.cmake files
 if (NOT FFmpeg_FIND_COMPONENTS)
-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL)
+  set(FFmpeg_FIND_COMPONENTS AVFORMAT AVCODEC AVUTIL SWSCALE SWRESAMPLE X264 X265)
 endif ()
 
 #
@@ -65,7 +65,7 @@ macro(find_component _component _pkgconfig _library _header)
      if (PKG_CONFIG_FOUND)
        pkg_check_modules(PC_${_component} ${_pkgconfig})
      endif ()
-  endif (NOT WIN32)
+ endif (NOT WIN32)
 
   find_path(${_component}_INCLUDE_DIRS ${_header}
     HINTS
@@ -99,14 +99,16 @@ endmacro()
 if (NOT FFMPEG_LIBRARIES)
 
   # Check for all possible component.
-  find_component(AVCODEC    libavcodec    avcodec  libavcodec/avcodec.h)
   find_component(AVFORMAT   libavformat   avformat libavformat/avformat.h)
+  find_component(AVCODEC    libavcodec    avcodec  libavcodec/avcodec.h)
   find_component(AVDEVICE   libavdevice   avdevice libavdevice/avdevice.h)
   find_component(AVUTIL     libavutil     avutil   libavutil/avutil.h)
   find_component(AVFILTER   libavfilter   avfilter libavfilter/avfilter.h)
   find_component(SWSCALE    libswscale    swscale  libswscale/swscale.h)
   find_component(POSTPROC   libpostproc   postproc libpostproc/postprocess.h)
   find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h)
+  find_component(X264       x264          x264      x264.h)
+  find_component(X265       x265          x265      x265.h)
 
   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
   foreach (_component ${FFmpeg_FIND_COMPONENTS})

cmake/MakeReleaseCommitAndTag.cmake

@@ -221,7 +221,7 @@ release notes.
 
 Run the following commands to commit the change:
 
-    git commit -m'release ${new_tag}' --signoff -S
+    git commit -a -m'release ${new_tag}' --signoff -S
     git tag -s -m'${new_tag}' ${new_tag}
 
 To rollback these changes, run this command:

cmake/MetalShaderSupport.cmake

@@ -0,0 +1,53 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENCE.txt or https://cmake.org/licensing for details.
+
+function(add_metal_shader_library TARGET)
+    cmake_parse_arguments(PARSE_ARGV 1 _amsl
+        ""
+        "STANDARD"
+        ""
+    )
+
+    add_library(${TARGET} MODULE ${_amsl_UNPARSED_ARGUMENTS})
+
+    set_target_properties(${TARGET} PROPERTIES
+        DEBUG_POSTFIX ""
+        XCODE_PRODUCT_TYPE com.apple.product-type.metal-library
+        XCODE_ATTRIBUTE_MTL_FAST_MATH "YES"
+        XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=Debug] "INCLUDE_SOURCE"
+        XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=RelWithDebInfo] "INCLUDE_SOURCE"
+        XCODE_ATTRIBUTE_MTL_HEADER_SEARCH_PATHS "$(HEADER_SEARCH_PATHS)"
+    )
+
+    if(_amsl_STANDARD AND _amsl_STANDARD MATCHES "metal([0-9]+)\.([0-9]+)")
+        target_compile_options(${TARGET}
+            PRIVATE "-std=${_amsl_STANDARD}"
+        )
+
+        set_target_properties(${TARGET} PROPERTIES
+            XCODE_ATTRIBUTE_MTL_LANGUAGE_REVISION "Metal${CMAKE_MATCH_1}${CMAKE_MATCH_2}"
+        )
+    endif()
+endfunction()
+
+function(target_embed_metal_shader_libraries TARGET)
+    cmake_parse_arguments(PARSE_ARGV 1 _temsl
+        ""
+        ""
+        ""
+    )
+
+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.28 AND ${CMAKE_GENERATOR} STREQUAL "Xcode")
+        set_target_properties(${TARGET} PROPERTIES
+            XCODE_EMBED_RESOURCES "${_temsl_UNPARSED_ARGUMENTS}"
+        )
+    else()
+        foreach(SHADERLIB IN LISTS _temsl_UNPARSED_ARGUMENTS)
+            add_dependencies(${TARGET} ${SHADERLIB})
+            add_custom_command(TARGET ${TARGET} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${SHADERLIB}>" "$<TARGET_BUNDLE_CONTENT_DIR:${TARGET}>/Resources/$<TARGET_FILE_NAME:${SHADERLIB}>"
+                VERBATIM
+            )
+        endforeach()
+    endif()
+endfunction()

cmake/Options.cmake

@@ -9,15 +9,11 @@ else()
 endif()
 
 set(ENABLE_SDL_DEFAULT ${BUILD_DEFAULT})
+
 if(WIN32 OR APPLE)
     set(ENABLE_SDL_DEFAULT OFF)
 endif()
 
-option(ENABLE_SDL "Build the SDL port" ${ENABLE_SDL_DEFAULT})
-option(ENABLE_WX "Build the wxWidgets port" ${BUILD_DEFAULT})
-option(ENABLE_DEBUGGER "Enable the debugger" ON)
-option(ENABLE_ASAN "Enable -fsanitize=address by default. Requires debug build with GCC/Clang" OFF)
-
 # Static linking
 set(VBAM_STATIC_DEFAULT OFF)
 if(VCPKG_TARGET_TRIPLET MATCHES -static OR CMAKE_TOOLCHAIN_FILE MATCHES "mxe|-static")
@@ -30,6 +26,8 @@ option(VBAM_STATIC "Try to link all libraries statically" ${VBAM_STATIC_DEFAULT}
 
 if(VBAM_STATIC)
     set(SDL2_STATIC ON)
+    set(SDL3_STATIC ON)
+    set(SFML_STATIC_LIBRARIES ON)
     set(FFMPEG_STATIC ON)
     set(OPENAL_STATIC ON)
     set_property(GLOBAL PROPERTY LINK_SEARCH_START_STATIC ON)
@@ -42,6 +40,49 @@ if(VBAM_STATIC)
     endif()
 endif()
 
+if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^([xX]86_64|[aA][mM][dD]64)$")
+   set(PKG_CONFIG_EXECUTABLE "$ENV{VCPKG_ROOT}/installed/x64-windows/tools/pkgconf/pkgconf.exe")
+endif()
+
+find_package(PkgConfig)
+
+if(UNIX AND NOT APPLE)
+    pkg_check_modules(SDL3 sdl3 QUIET)
+else()
+    find_package(SDL3 QUIET)
+endif()
+
+option(ENABLE_SDL3 "Use SDL3" "${SDL3_FOUND}")
+
+if(NOT TRANSLATIONS_ONLY)
+    if(ENABLE_SDL3)
+        if(NOT UNIX)
+            find_package(SDL3 REQUIRED)
+        endif()
+    else()
+        find_package(SDL2 REQUIRED)
+    endif()
+endif()
+
+option(ENABLE_GENERIC_FILE_DIALOGS "Use generic file dialogs" OFF)
+option(DISABLE_OPENGL "Disable OpenGL" OFF)
+option(ENABLE_SDL "Build the SDL port" ${ENABLE_SDL_DEFAULT})
+option(ENABLE_WX "Build the wxWidgets port" ${BUILD_DEFAULT})
+option(ENABLE_DEBUGGER "Enable the debugger" ON)
+option(ENABLE_ASAN "Enable -fsanitize=address by default. Requires debug build with GCC/Clang" OFF)
+option(ENABLE_BZ2 "Enable BZ2 archive support" ON)
+option(ENABLE_LZMA "Enable LZMA archive support" ON)
+
+if(ENABLE_SDL3)
+   set(CMAKE_C_FLAGS "-DENABLE_SDL3 ${CMAKE_C_FLAGS}")
+   set(CMAKE_CXX_FLAGS "-DENABLE_SDL3 ${CMAKE_CXX_FLAGS}")
+endif()
+
+if(DISABLE_OPENGL)
+   set(CMAKE_C_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_C_FLAGS}")
+   set(CMAKE_CXX_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_CXX_FLAGS}")
+endif()
+
 option(ENABLE_ASM "Enable x86 ASM related options" OFF)
 
 # The ARM ASM core seems to be very buggy, see #98 and #54. Default to it being
@@ -64,8 +105,6 @@ if(APPLE AND NOT DISABLE_MACOS_PACKAGE_MANAGERS)
     include(MacPackageManagers)
 endif()
 
-find_package(PkgConfig)
-
 # Link / SFML
 if(NOT TRANSLATIONS_ONLY)
     set(ENABLE_LINK_DEFAULT ON)
@@ -74,27 +113,28 @@ option(ENABLE_LINK "Enable GBA linking functionality" ${ENABLE_LINK_DEFAULT})
 
 # FFMpeg
 set(FFMPEG_DEFAULT OFF)
-set(FFMPEG_COMPONENTS         AVCODEC            AVFORMAT            SWSCALE          AVUTIL            SWRESAMPLE)
-set(FFMPEG_COMPONENT_VERSIONS AVCODEC>=58.18.100 AVFORMAT>=58.12.100 SWSCALE>=5.1.100 AVUTIL>=56.14.100 SWRESAMPLE>=3.1.100)
+set(FFMPEG_COMPONENTS         AVFORMAT            AVCODEC            SWSCALE          AVUTIL            SWRESAMPLE          X264    X265)
+set(FFMPEG_COMPONENT_VERSIONS AVFORMAT>=58.12.100 AVCODEC>=58.18.100 SWSCALE>=5.1.100 AVUTIL>=56.14.100 SWRESAMPLE>=3.1.100 X264>=0 X265>=0)
 
-if(NOT TRANSLATIONS_ONLY AND (NOT DEFINED ENABLE_FFMPEG OR ENABLE_FFMPEG) AND (NOT (X86 AND MINGW)))
+if(NOT TRANSLATIONS_ONLY AND (NOT DEFINED ENABLE_FFMPEG OR ENABLE_FFMPEG))
     set(FFMPEG_DEFAULT ON)
 
     find_package(FFmpeg COMPONENTS ${FFMPEG_COMPONENTS})
+
     # check versions, but only if pkgconfig is available
-    if(FFMPEG_FOUND AND PKG_CONFIG_FOUND AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
+    if(FFmpeg_FOUND AND PKG_CONFIG_FOUND AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
         foreach(component ${FFMPEG_COMPONENT_VERSIONS})
             string(REPLACE ">=" ";" parts ${component})
             list(GET parts 0 name)
             list(GET parts 1 version)
 
             if((NOT DEFINED ${name}_VERSION) OR ${name}_VERSION VERSION_LESS ${version})
-                set(FFMPEG_FOUND OFF)
+                set(FFmpeg_FOUND OFF)
             endif()
         endforeach()
     endif()
 
-    if(NOT FFMPEG_FOUND)
+    if(NOT FFmpeg_FOUND)
         set(FFMPEG_DEFAULT OFF)
     endif()
 endif()
@@ -125,7 +165,7 @@ if(WIN32)
     option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
 
     set(XAUDIO2_DEFAULT ON)
-    if (MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    if ((MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR (MINGW AND X86))
         # TODO: We should update the XAudio headers to build with clang-cl. See
         # https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1021
         set(XAUDIO2_DEFAULT OFF)
@@ -133,6 +173,17 @@ if(WIN32)
     option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ${XAUDIO2_DEFAULT})
 endif()
 
+find_package(OpenAL QUIET)
+
+set(OPENAL_DEFAULT ${OpenAL_FOUND})
+
+if(MINGW AND X86)
+    # OpenAL-Soft uses avrt.dll which is not available on Windows XP.
+    set(OPENAL_DEFAULT OFF)
+endif()
+
+option(ENABLE_OPENAL "Enable OpenAL-Soft sound output for the wxWidgets port" ${OPENAL_DEFAULT})
+
 set(ENABLE_FAUDIO_DEFAULT OFF)
 
 find_package(FAudio QUIET)
@@ -155,3 +206,13 @@ if(TRANSLATIONS_ONLY AND (ENABLE_SDL OR ENABLE_WX))
 endif()
 
 option(GPG_SIGNATURES "Create GPG signatures for release files" OFF)
+
+if(APPLE)
+   set(wx_mac_patched_default OFF)
+
+   if(UPSTREAM_RELEASE)
+      set(wx_mac_patched_default ON)
+   endif()
+
+   option(WX_MAC_PATCHED "A build of wxWidgets that is patched for the alert sound bug is being used" ${wx_mac_patched_default})
+endif()

cmake/Set-Toolchain-vcpkg.cmake

@@ -26,9 +26,8 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET)
 
                 foreach(path $ENV{PATH})
                     if(path MATCHES "[Hh]ost[Xx]64")
-                        set(VCPKG_HOST_TRIPLET "x64-windows-static" CACHE STRING "Vcpkg host triplet" FORCE)
+                        set(VCPKG_HOST_TRIPLET "x64-windows" CACHE STRING "Vcpkg host triplet" FORCE)
                         set(VCPKG_USE_HOST_TOOLS ON CACHE BOOL "Use vcpkg host tools" FORCE)
-                        break()
                     endif()
                 endforeach()
 
@@ -151,24 +150,16 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
     string(REPLACE "-" "." pkg_ver ${pkg_ver})
 
     if(NOT DEFINED VCPKG_INSTALLED_COUNT)
-        if(VCPKG_ROOT MATCHES "Visual Studio")
-            execute_process(
-                COMMAND ${powershell}
-                    -executionpolicy bypass -noprofile
-                    -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list"
-                OUTPUT_VARIABLE vcpkg_list_text
-            )
-        else()
-            execute_process(
-                COMMAND ${vcpkg_exe} list
-                OUTPUT_VARIABLE vcpkg_list_text
-                ERROR_QUIET
-            )
-        endif()
+        execute_process(
+            COMMAND ${powershell}
+                -executionpolicy bypass -noprofile
+                -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list"
+            OUTPUT_VARIABLE vcpkg_list_text
+        )
 
         string(REGEX REPLACE "\r?\n" ";" vcpkg_list_raw "${vcpkg_list_text}")
 
-        set(VCPKG_INSTALLED_COUNT 0 PARENT_SCOPE)
+        set(VCPKG_INSTALLED_COUNT 0 CACHE INTERNAL "Number of installed vcpkg packages" FORCE)
         foreach(pkg ${vcpkg_list_raw})
             if(NOT pkg MATCHES "^([^:[]+)[^:]*:([^ ]+) +([0-9][^ ]*) +.*\$")
                 continue()
@@ -190,8 +181,8 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
             list(APPEND VCPKG_INSTALLED ${inst_pkg_name} ${inst_pkg_ver} ${inst_pkg_rev} ${inst_pkg_triplet})
             math(EXPR VCPKG_INSTALLED_COUNT "${VCPKG_INSTALLED_COUNT} + 1")
         endforeach()
-        set(VCPKG_INSTALLED       ${VCPKG_INSTALLED}       PARENT_SCOPE)
-        set(VCPKG_INSTALLED_COUNT ${VCPKG_INSTALLED_COUNT} PARENT_SCOPE)
+        set(VCPKG_INSTALLED       ${VCPKG_INSTALLED}       CACHE INTERNAL "List of installed vcpkg packages"   FORCE)
+        set(VCPKG_INSTALLED_COUNT ${VCPKG_INSTALLED_COUNT} CACHE INTERNAL "Number of installed vcpkg packages" FORCE)
     endif()
 
     if(NOT VCPKG_INSTALLED_COUNT GREATER 0)
@@ -225,48 +216,79 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
     endforeach()
 endfunction()
 
+function(get_triplet_package_list triplet)
+    if(EXISTS "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html")
+        return()
+    endif()
+
+    file(
+        DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
+        STATUS pkg_list_status
+    )
+    list(GET pkg_list_status 1 pkg_list_error)
+    list(GET pkg_list_status 0 pkg_list_status)
+
+    if(NOT pkg_list_status EQUAL 0)
+        message(STATUS "Failed to download vcpkg binary package list: ${pkg_list_status} - ${pkg_list_error}")
+        return()
+    endif()
+endfunction()
+
+function(download_package pkg pkgs_dir)
+    string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg})
+
+    message(STATUS "Downloading https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg} ...")
+
+    file(
+        DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg}" "${pkgs_dir}/${pkg}"
+        STATUS pkg_download_status
+    )
+    list(GET pkg_download_status 1 pkg_download_error)
+    list(GET pkg_download_status 0 pkg_download_status)
+
+    if(NOT pkg_download_status EQUAL 0)
+        message(STATUS "Failed to download vcpkg binary package '${pkg}': ${pkg_download_status} - ${pkg_download_error}")
+        return()
+    endif()
+
+    message(STATUS "done.")
+endfunction()
+
+function(zip_is_installed vcpkg_exe zip outvar)
+    if(NOT zip MATCHES "([^_]+)_([^_]+)_([^.]+)[.]zip")
+        return()
+    endif()
+    set(pkg_name    ${CMAKE_MATCH_1})
+    set(pkg_version ${CMAKE_MATCH_2})
+    set(pkg_triplet ${CMAKE_MATCH_3})
+
+    vcpkg_is_installed(${vcpkg_exe} ${pkg_name} ${pkg_version} ${pkg_triplet} ${POWERSHELL} pkg_installed)
+
+    set(${outvar} ${pkg_installed} PARENT_SCOPE)
+endfunction()
+
+function(cleanup_binary_packages)
+    file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/vcpkg-binary-packages")
+
+    unset(VCPKG_INSTALLED       CACHE)
+    unset(VCPKG_INSTALLED_COUNT CACHE)
+endfunction()
+
 function(get_binary_packages vcpkg_exe)
     set(binary_packages_installed FALSE PARENT_SCOPE)
 
-    unset(triplets)
-    unset(host_triplet)
-    # Determine host triplet for vcpkg build dependencies
-    if(WIN32)
-        if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Rr][Mm]64")
-            set(host_triplet "arm64-windows")
-        elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Mm][Dd]64|[Xx]64")
-            set(host_triplet "x64-windows")
-        else()
-            set(host_triplet "x86-windows")
-        endif()
+    get_triplet_package_list(${VCPKG_TARGET_TRIPLET})
+
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/binary_package_list_${VCPKG_TARGET_TRIPLET}.html")
+        message(STATUS "Failed to download binary package list found for triplet '${VCPKG_TARGET_TRIPLET}', aborting.")
+        return()
     endif()
-    if(DEFINED host_triplet)
-        list(APPEND triplets ${host_triplet})
-    endif()
-    list(APPEND triplets ${VCPKG_TARGET_TRIPLET})
 
-    foreach(triplet ${triplets})
-        file(
-            DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
-            STATUS pkg_list_status
-        )
-        list(GET pkg_list_status 1 pkg_list_error)
-        list(GET pkg_list_status 0 pkg_list_status)
-
-        if(NOT pkg_list_status EQUAL 0)
-            message(STATUS "Failed to download vcpkg binary package list: ${pkg_list_status} - ${pkg_list_error}")
-            return()
-        endif()
-    endforeach()
-
-    unset(binary_packages)
-    foreach(triplet ${triplets})
-        file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" raw_html)
-        string(REGEX MATCHALL "<a href=\"[^\"]+[.]zip\"" links ${raw_html})
-        foreach(link ${links})
-            string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${link})
-            list(APPEND binary_packages ${pkg})
-        endforeach()
+    file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${VCPKG_TARGET_TRIPLET}.html" raw_html)
+    string(REGEX MATCHALL "<a href=\"[^\"]+[.]zip\"" links ${raw_html})
+    foreach(link ${links})
+        string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${link})
+        list(APPEND binary_packages ${pkg})
     endforeach()
 
     set(vcpkg_binpkg_dir ${CMAKE_BINARY_DIR}/vcpkg-binpkg)
@@ -279,19 +301,11 @@ function(get_binary_packages vcpkg_exe)
 
     FetchContent_GetProperties(vcpkg_binpkg)
     if(NOT vcpkg_binpkg_POPULATED)
-        FetchContent_Populate(vcpkg_binpkg)
+        FetchContent_MakeAvailable(vcpkg_binpkg)
     endif()
 
-    unset(to_install)
     foreach(pkg ${binary_packages})
-        if(NOT pkg MATCHES "([^_]+)_([^_]+)_([^.]+)[.]zip")
-            continue()
-        endif()
-        set(pkg_name    ${CMAKE_MATCH_1})
-        set(pkg_version ${CMAKE_MATCH_2})
-        set(pkg_triplet ${CMAKE_MATCH_3})
-
-        vcpkg_is_installed(${vcpkg_exe} ${pkg_name} ${pkg_version} ${pkg_triplet} ${POWERSHELL} pkg_installed)
+        zip_is_installed(${vcpkg_exe} ${pkg} pkg_installed)
 
         if(NOT pkg_installed)
             list(APPEND to_install ${pkg})
@@ -303,26 +317,82 @@ function(get_binary_packages vcpkg_exe)
         file(MAKE_DIRECTORY ${bin_pkgs_dir})
 
         foreach(pkg ${to_install})
-            string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg})
+            download_package("${pkg}" "${bin_pkgs_dir}")
 
-            message(STATUS "Downloading https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg} ...")
+            if(NOT EXISTS "${bin_pkgs_dir}/${pkg}")
+                message(STATUS "Failed to download package '${pkg}', aborting.")
+                return()
+            endif()
+        endforeach()
 
-            file(
-                DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}"
-                STATUS pkg_download_status
+        unset(installed_host_deps)
+
+        while(TRUE)
+#                       -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-listmissing ."
+            execute_process(
+                COMMAND ${POWERSHELL}
+                    -executionpolicy bypass -noprofile
+                    -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-listmissing ."
+                WORKING_DIRECTORY ${bin_pkgs_dir}
+                OUTPUT_VARIABLE host_deps
+                RESULT_VARIABLE host_deps_status
             )
-            list(GET pkg_download_status 1 pkg_download_error)
-            list(GET pkg_download_status 0 pkg_download_status)
 
-            if(NOT pkg_download_status EQUAL 0)
-                message(STATUS "Failed to download vcpkg binary package '${pkg}': ${pkg_download_status} - ${pkg_download_error}")
+            if(NOT host_deps_status EQUAL 0)
+                message(STATUS "Failed to calculate host dependencies: ${host_deps_status}")
                 return()
             endif()
 
-            message(STATUS "done.")
-        endforeach()
+            string(REGEX REPLACE "\r?\n"   ";" host_deps "${host_deps}")
+            string(REGEX REPLACE " *;+ *$" ""  host_deps "${host_deps}")
+
+            list(LENGTH host_deps           host_deps_count)
+            list(LENGTH installed_host_deps installed_host_deps_count)
+
+            if(host_deps_count EQUAL installed_host_deps_count)
+                break()
+            endif()
+
+            foreach(host_dep ${host_deps})
+                if(NOT host_dep MATCHES "^([^:]+):([^:]+)\$")
+                    continue()
+                endif()
+                set(host_dep_name    ${CMAKE_MATCH_1})
+                set(host_dep_triplet ${CMAKE_MATCH_2})
+
+                get_triplet_package_list(${host_dep_triplet})
+
+                file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${host_dep_triplet}.html" raw_html)
+                string(REGEX MATCHALL "<a href=\"${host_dep_name}_[^\"]+[.]zip\"" links ${raw_html})
+
+                list(LENGTH links links_count)
+
+                if(NOT links_count EQUAL 1)
+                    message(STATUS "Multiple host dependencies found for '${host_dep_name}' for triplet '${host_dep_triplet}', aborting.")
+                    return()
+                endif()
+
+                string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${links})
+
+                list(FIND installed_host_deps "${pkg}" found_idx)
+
+                if(found_idx EQUAL -1)
+                    zip_is_installed(${vcpkg_exe} ${pkg} pkg_installed)
+
+                    if(NOT pkg_installed)
+                        download_package("${pkg}" "${bin_pkgs_dir}")
+
+                        if(NOT EXISTS "${bin_pkgs_dir}/${pkg}")
+                            message(STATUS "Failed to download host dependency package '${pkg}', aborting.")
+                            return()
+                        endif()
+                    else()
+                        list(APPEND installed_host_deps "${pkg}")
+                    endif()
+                endif()
+            endforeach()
+        endwhile()
 
-#                -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-instpkg ."
         execute_process(
             COMMAND ${POWERSHELL}
                 -executionpolicy bypass -noprofile
@@ -333,6 +403,8 @@ function(get_binary_packages vcpkg_exe)
         file(REMOVE_RECURSE ${bin_pkgs_dir})
     endif()
 
+    cleanup_binary_packages()
+
     set(binary_packages_installed TRUE PARENT_SCOPE)
 endfunction()
 
@@ -355,11 +427,12 @@ function(vcpkg_remove_optional_deps vcpkg_exe)
 endfunction()
 
 function(vcpkg_set_toolchain)
+    get_filename_component(preferred_root ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
+
     if(NOT DEFINED POWERSHELL)
         message(FATAL_ERROR "Powershell is required to use vcpkg binaries.")
     endif()
     if(NOT DEFINED ENV{VCPKG_ROOT})
-        get_filename_component(preferred_root ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
 
         if(WIN32)
             if(DEFINED ENV{CI} OR EXISTS /vcpkg)
@@ -390,6 +463,22 @@ function(vcpkg_set_toolchain)
         set(VCPKG_ROOT $ENV{VCPKG_ROOT})
     endif()
 
+    # Avoid using Visual Studio default vcpkg, because that requires elevaction.
+    if(VCPKG_ROOT MATCHES "Visual Studio")
+        set(mkdir_status 0)
+        if(NOT EXISTS "${preferred_root}")
+            file(
+                MAKE_DIRECTORY "${preferred_root}"
+                RESULT mkdir_status
+            )
+        endif()
+
+        if(mkdir_status EQUAL 0)
+            set(VCPKG_ROOT "${preferred_root}")
+            set(ENV{VCPKG_ROOT} ${VCPKG_ROOT})
+        endif()
+    endif()
+
     set(VCPKG_ROOT ${VCPKG_ROOT} CACHE FILEPATH "vcpkg installation root path" FORCE)
 
     if(NOT EXISTS ${VCPKG_ROOT})
@@ -474,6 +563,10 @@ function(vcpkg_set_toolchain)
 
     foreach(pkg ${VCPKG_DEPS})
         list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${VCPKG_TARGET_TRIPLET})
+
+        if(VCPKG_TARGET_TRIPLET STREQUAL "x86-mingw-static")
+            list(APPEND VCPKG_DEPS_QUALIFIED libsamplerate:x86-mingw-static)
+        endif()
     endforeach()
 
     if(WIN32)
@@ -482,13 +575,9 @@ function(vcpkg_set_toolchain)
         set(vcpkg_exe "${VCPKG_ROOT}/vcpkg")
     endif()
 
-    # update portfiles
-    execute_process(
-        COMMAND ${vcpkg_exe} update
-        WORKING_DIRECTORY ${VCPKG_ROOT}
-    )
-
-    get_binary_packages(${vcpkg_exe})
+    if (NOT (NO_VCPKG_UPDATES OR (NOT VCPKG_BINARY_PACKAGES)))
+        get_binary_packages(${vcpkg_exe})
+    endif()
 
     if(NOT binary_packages_installed)
         # Get number of seconds since midnight (might be wrong if am/pm is in effect on Windows.)
@@ -560,14 +649,10 @@ function(vcpkg_set_toolchain)
     endif()
 
     if(WIN32 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio" AND NOT DEFINED CMAKE_CXX_COMPILER)
-        if(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-windows-")
+        if(VCPKG_TARGET_TRIPLET MATCHES "-windows-")
             # set toolchain to VS for e.g. Ninja or jom
             set(CMAKE_C_COMPILER   cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
             set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
-        elseif(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-mingw-")
-            # set toolchain to MinGW for e.g. Ninja or jom
-            set(CMAKE_C_COMPILER   gcc CACHE STRING "MinGW GCC C Compiler"   FORCE)
-            set(CMAKE_CXX_COMPILER g++ CACHE STRING "MinGW G++ C++ Compiler" FORCE)
         endif()
     endif()
 

cmake/Toolchain-gcc-clang.cmake

@@ -1,5 +1,5 @@
 if(X86_32 OR X86_64)
-    add_compile_options(-mfpmath=sse -msse2)
+    add_compile_options(-msse2)
 endif()
 
 if(UPSTREAM_RELEASE)
@@ -47,6 +47,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     endif()
 endif()
 
+#add_compile_options(-std=c++14)
+
 if(NOT ENABLE_ASM) # inline asm is not allowed with -fPIC
     add_compile_options(-fPIC)
 endif()

cmake/Toolchain-msvc.cmake

@@ -68,6 +68,8 @@ if(CMAKE_VERSION VERSION_LESS "3.25")
     endif()
 endif()
 
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++17>)
+
 set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "" FORCE)
 
 # We need to explicitly set all of these to override the CMake defaults.

cmake/VbamFunctions.cmake

@@ -37,8 +37,48 @@ function(check_clean_exit var)
     set(${var} ${exit_status} PARENT_SCOPE)
 endfunction()
 
+function(try_wx_util var util conf_suffix major_version minor_version)
+    unset(suffix)
+    if(conf_suffix)
+        set(suffix "-${conf_suffix}")
+    endif()
+    if(major_version)
+        set(suffix "${suffix}-${major_version}")
+
+        if(NOT minor_version EQUAL -1)
+            set(suffix "${suffix}.${minor_version}")
+        endif()
+    endif()
+
+    # find_program caches the result
+    set(exe NOTFOUND CACHE INTERNAL "" FORCE)
+    find_program(exe NAMES "${util}${suffix}")
+
+    # try infix variant, as on FreeBSD
+    if(NOT EXISTS "${exe}")
+        string(REGEX REPLACE "^-" "" suffix "${suffix}")
+
+        string(REGEX REPLACE "-" "${suffix}-" try "${util}")
+
+        set(exe NOTFOUND CACHE INTERNAL "" FORCE)
+        find_program(exe NAMES "${try}")
+    endif()
+
+    if(EXISTS "${exe}")
+        # check that the utility can be executed cleanly
+        # in case we find e.g. the wrong architecture binary
+        # when cross-compiling
+        check_clean_exit(exit_status "${exe}" --help)
+
+        if(exit_status EQUAL 0)
+            set("${var}" "${exe}" PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+endfunction()
+
 function(find_wx_util var util)
-    if(WIN32 OR EXISTS /etc/gentoo-release)
+    if((WIN32 AND (NOT CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")) OR EXISTS /etc/gentoo-release)
         # On win32, including cross builds we prefer the plain utility
         # name first from PATH, with the exception of -static for static
         # builds.
@@ -57,48 +97,34 @@ function(find_wx_util var util)
         set(major_versions ";")
     endif()
 
-    list(APPEND conf_suffixes  gtk4u gtk4 gtk3u gtk3 gtk2u gtk2 "")
-    list(APPEND major_versions 4 3 2 "")
+    list(APPEND conf_suffixes  "" gtk3u gtk3 gtk2u gtk2)
+    list(APPEND major_versions "" 3)
+
+    get_target_property(wx_base_lib_prop wx::base LOCATION)
+    string(STRIP "${wx_base_lib_prop}" wx_base_lib)
+
+    if(wx_base_lib MATCHES "wx_baseu?-([0-9]+)\\.([0-9]+)\\.")
+        set(lib_major "${CMAKE_MATCH_1}")
+        set(lib_minor "${CMAKE_MATCH_2}")
+    endif()
 
     foreach(conf_suffix IN LISTS conf_suffixes)
+        if(lib_major AND lib_minor)
+            try_wx_util(exe "${util}" "${conf_suffix}" "${lib_major}" "${lib_minor}")
+
+            if(exe)
+                set("${var}" "${exe}" PARENT_SCOPE)
+                return()
+            endif()
+        endif()
+
         foreach(major_version IN LISTS major_versions)
-            foreach(minor_version RANGE 100 -1 -1)
-                unset(suffix)
-                if(conf_suffix)
-                    set(suffix "-${conf_suffix}")
-                endif()
-                if(major_version)
-                    set(suffix "${suffix}-${major_version}")
+            foreach(minor_version RANGE 30 -1 -1)
+                try_wx_util(exe "${util}" "${conf_suffix}" "${major_version}" "${minor_version}")
 
-                    if(NOT minor_version EQUAL -1)
-                        set(suffix "${suffix}.${minor_version}")
-                    endif()
-                endif()
-
-                # find_program caches the result
-                set(exe NOTFOUND CACHE INTERNAL "" FORCE)
-                find_program(exe NAMES "${util}${suffix}")
-
-                # try infix variant, as on FreeBSD
-                if(NOT EXISTS ${exe})
-                    string(REGEX REPLACE "^-" "" suffix "${suffix}")
-
-                    string(REGEX REPLACE "-" "${suffix}-" try ${util})
-
-                    set(exe NOTFOUND CACHE INTERNAL "" FORCE)
-                    find_program(exe NAMES ${try})
-                endif()
-
-                if(EXISTS ${exe})
-                    # check that the utility can be executed cleanly
-                    # in case we find e.g. the wrong architecture binary
-                    # when cross-compiling
-                    check_clean_exit(exit_status ${exe} --help)
-
-                    if(exit_status EQUAL 0)
-                        set(${var} ${exe} PARENT_SCOPE)
-                        return()
-                    endif()
+                if(exe)
+                    set("${var}" "${exe}" PARENT_SCOPE)
+                    return()
                 endif()
 
                 # don't iterate over minor versions for empty major version

default.nix

@@ -2,7 +2,7 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
     name = "visualboyadvance-m";
     buildInputs = if stdenv.isDarwin then
-        [ ninja cmake nasm faudio gettext libintl libtiff pkg-config zip zlib openal ffmpeg wxGTK32 SDL2 pcre pcre2 darwin.apple_sdk.frameworks.System darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.OpenAL llvmPackages_latest.clang llvmPackages_latest.bintools ]
+        [ ninja cmake nasm faudio gettext libintl libtiff pkg-config zip zlib openal ffmpeg wxGTK32 sdl3 pcre pcre2 darwin.apple_sdk.frameworks.System darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.OpenAL llvmPackages_latest.clang llvmPackages_latest.bintools ]
     else
-        [ ninja cmake gcc clang llvm llvmPackages.libcxx nasm faudio gettext libintl libtiff pkg-config zip zlib openal ffmpeg wxGTK32 libGL libGLU glfw SDL2 gtk3-x11 pcre pcre2 util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon libepoxy dbus at-spi2-core ];
+        [ ninja cmake gcc clang llvm llvmPackages.libcxx nasm faudio gettext libintl libtiff pkg-config zip zlib openal ffmpeg wxGTK32 libGL libGLU glfw sdl3 gtk3-x11 pcre pcre2 util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon libepoxy dbus at-spi2-core ];
 }

installdeps

@@ -191,7 +191,7 @@ freebsd_installdeps() {
 
     check sudo pkg update
 
-    pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl2 wx31-gtk3 iconv zip ninja"
+    pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl3 wx31-gtk3 iconv zip ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 
@@ -320,8 +320,6 @@ debian_installdeps() {
 
         glew_lib=$(apt-cache search libglew | grep '^libglew[0-9]' | sed 's/ - .*//' | sort -r | head -1)
 
-        sdl_lib=$(apt-cache search '^libsdl2-2.0' | sed 's/ - .*//' | sort -r | head -1)
-
         # not present in trusty
         if [ -n "$ENABLE_FFMPEG" ]; then
             libswresample_dev=$(apt-cache search libswresample-dev | awk '{print $1}')
@@ -344,7 +342,7 @@ debian_installdeps() {
                 ;;
         esac
 
-        pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl2-dev $sdl_lib libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev"
+        pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl3-dev libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev"
 
         [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev"
 
@@ -395,7 +393,7 @@ debian_installdeps() {
             fi
         fi
 
-        deps="gcc zlib ffmpeg gettext sdl2 openal wxwidgets openal"
+        deps="gcc zlib ffmpeg gettext sdl3 openal wxwidgets openal"
         [ -n "$ENABLE_FFMPEG" ] && deps="$deps ffmpeg"
 
         set --
@@ -492,7 +490,7 @@ fedora_installdeps() {
             # this is sometimes necessary for rawhide
             set -- --exclude='glibc32*'
         fi
-        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK-devel gtk3-devel; do
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK-devel gtk3-devel; do
             case $pkg in
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
@@ -585,7 +583,7 @@ fedora_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets3 openal-soft; do
+        for pkg in zlib gettext SDL3 wxWidgets3 openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
 
@@ -676,7 +674,7 @@ rhel_installdeps() {
             set -- --exclude='glibc32*'
         fi
 
-        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
             case $pkg in
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
@@ -761,7 +759,7 @@ rhel_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets openal-soft; do
+        for pkg in zlib gettext SDL3 wxWidgets openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
 
@@ -787,7 +785,7 @@ suse_installdeps() {
 
     tools="make cmake ccache nasm gettext-tools pkg-config ccache zip ninja"
 
-    libs="gcc gcc-c++ libSDL2-devel wxGTK3-3_2-devel openal-soft-devel ffmpeg-7-libavcodec-devel ffmpeg-7-libavdevice-devel ffmpeg-7-libavfilter-devel ffmpeg-7-libavformat-devel ffmpeg-7-libavutil-devel ffmpeg-7-libpostproc-devel ffmpeg-7-libswresample-devel ffmpeg-7-libswscale-devel"
+    libs="gcc gcc-c++ SDL3-devel wxGTK3-3_2-devel openal-soft-devel ffmpeg-7-libavcodec-devel ffmpeg-7-libavdevice-devel ffmpeg-7-libavfilter-devel ffmpeg-7-libavformat-devel ffmpeg-7-libavutil-devel ffmpeg-7-libpostproc-devel ffmpeg-7-libswresample-devel ffmpeg-7-libswscale-devel"
 
     if [ "$target" = m32 ]; then
         error '32 bit cross builds are no longer supported on OpenSUSE'
@@ -854,7 +852,7 @@ archlinux_installdeps() {
 
     $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic
 
-    libs="zlib mesa gettext sdl2 wxgtk3 $gtk openal"
+    libs="zlib mesa gettext sdl3 wxgtk3 $gtk openal"
 
     [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg"
 
@@ -950,7 +948,7 @@ EOF
           fi
         done
 
-        deps="zlib gettext pkg-config sdl2 wxmsw openal"
+        deps="zlib gettext pkg-config sdl3 wxmsw openal"
 
         # and the actual deps
         for p in $deps; do
@@ -979,7 +977,7 @@ solus_installdeps() {
     check sudo eopkg -y install -c system.devel
     check sudo eopkg -y install git ccache ninja
 
-    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel
+    set -- sdl3-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel
 
     if [ -n "$amd64" -a "$target" = m32 ]; then
         info_msg 'Calculating dependencies, this will take a while..'
@@ -1052,7 +1050,7 @@ gentoo_installdeps() {
       dev-build/cmake \
       dev-util/ccache \
       sys-devel/binutils \
-      media-libs/libsdl2 \
+      media-libs/libsdl3 \
       media-libs/openal \
       x11-libs/wxGTK:$wx_slot \
       sys-libs/zlib \
@@ -1070,7 +1068,7 @@ gentoo_installdeps() {
 alpine_installdeps() {
     installing
 
-    check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl2-dev glu-dev wxwidgets-dev gtk+3.0-dev zip
+    check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl3-dev glu-dev wxwidgets-dev gtk+3.0-dev zip
 
     build_instructions
 }
@@ -1105,7 +1103,7 @@ windows_installdeps() {
             ;;
     esac
 
-    pkgs="$pkgs SDL2 wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal"
+    pkgs="$pkgs SDL3 wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal"
 
     case "$target" in
         *x86_64)
@@ -1177,7 +1175,7 @@ brew_installdeps() {
 
     check brew -v update
 
-    brews="nasm cmake ccache gettext libtiff pkg-config sdl2 wxwidgets faudio ccache ninja zlib"
+    brews="nasm cmake ccache gettext libtiff pkg-config sdl3 wxwidgets faudio ccache ninja zlib"
 
     [ -n "$ENABLE_FFMPEG" ] && brews="$brews ffmpeg"
 
@@ -1203,7 +1201,7 @@ macports_installdeps() {
 
     check sudo port -v selfupdate
 
-    ports="cmake ccache nasm gettext pkgconfig libsdl2 wxWidgets-3.0 libiconv ninja"
+    ports="cmake ccache nasm gettext pkgconfig libsdl3 wxWidgets-3.0 libiconv ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg"
 
@@ -1219,7 +1217,7 @@ fink_installdeps() {
 
     check sudo fink -vy selfupdate
 
-    pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev ccache ninja"
+    pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl3 wxwidgets300-osxcocoa libiconv-dev ccache ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 

po/wxvbam/en_US.po

@@ -1560,6 +1560,14 @@ msgstr ""
 msgid "Using interframe blending: %s"
 msgstr ""
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits per pixel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits per pixel:"
+
 #: dialogs/game-boy-config.cpp:142 xrc/GameBoyAdvanceConfig.xrc:122
 #: xrc/GameBoyConfig.xrc:138 xrc/GameBoyConfig.xrc:159
 msgid "(None)"

po/wxvbam/es_CO.po

@@ -1553,6 +1553,14 @@ msgstr "No usable rpi plugins found in %s"
 msgid "Plugin"
 msgstr "Plugin"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits per píxel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits per píxel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/es_PE.po

@@ -1549,6 +1549,14 @@ msgstr "No usable rpi plugins found in %s"
 msgid "Plugin"
 msgstr "Plugin"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits per píxel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits per píxel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/es_US.po

@@ -1549,6 +1549,14 @@ msgstr "No usable rpi plugins found in %s"
 msgid "Plugin"
 msgstr "Plugin"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits per píxel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits per píxel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/fr.po

@@ -1563,6 +1563,14 @@ msgstr "Extension rpi utilisable non trouvée dans %s"
 msgid "Plugin"
 msgstr "Extension"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits par pixel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits par pixel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/hu.po

@@ -1549,6 +1549,14 @@ msgstr "A %s helyen nincs használható RPI bővítmény"
 msgid "Plugin"
 msgstr "Bővítmény"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bit per pixel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bit per pixel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/ko.po

@@ -1552,6 +1552,14 @@ msgstr "%s에서 사용가능한 rpi 플러그인을 찾을 수 없음"
 msgid "Plugin"
 msgstr "플러그인"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "픽셀당 비트"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "픽셀당 비트:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/pl.po

@@ -1552,6 +1552,14 @@ msgstr "Nie znaleziono użytecznych wtyczek rpi w %s"
 msgid "Plugin"
 msgstr "Wtyczka"
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bity na piksel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bity na piksel:"
+
 #: dialogs/display-config.cpp:417
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/pt_PT.po

@@ -362,6 +362,14 @@ msgstr ""
 msgid "Plugin"
 msgstr ""
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr "Bits por pixel"
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr "Bits por pixel:"
+
 #: dialogs/display-config.cpp:407
 #, c-format
 msgid "Using pixel filter: %s"

po/wxvbam/ur_PK.po

@@ -1046,6 +1046,14 @@ msgstr ""
 msgid "Invalid value for Default magnification."
 msgstr ""
 
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth"
+msgstr ""
+
+#: xrc/DisplayConfig.xrc
+msgid "Bit Depth:"
+msgstr ""
+
 #: dialogs/display-config.cpp:331 xrc/DisplayConfig.xrc:86
 #: xrc/DisplayConfig.xrc:136 xrc/DisplayConfig.xrc:222
 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204

src/components/CMakeLists.txt

@@ -2,5 +2,6 @@ add_subdirectory(av_recording)
 add_subdirectory(draw_text)
 add_subdirectory(filters)
 add_subdirectory(filters_agb)
+add_subdirectory(filters_cgb)
 add_subdirectory(filters_interframe)
 add_subdirectory(user_config)

src/components/av_recording/av_recording.cpp

@@ -119,24 +119,48 @@ recording::MediaRet recording::MediaRecorder::setup_audio_stream()
     // audio codec context
     aenc = avcodec_alloc_context3(acodec);
     if (!aenc) return MRET_ERR_BUFSIZE;
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100)
     aenc->sample_fmt = acodec->sample_fmts ? acodec->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+#else
+    const enum AVSampleFormat *sample_fmts = NULL;
+    if (acodec) {
+        avcodec_get_supported_config (aenc, acodec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0,
+                                      (const void **)&sample_fmts, NULL);
+        aenc->sample_fmt = sample_fmts ? sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
+    }
+#endif
     aenc->bit_rate = 128000; // mp3
     aenc->sample_rate = sampleRate;
     // this might be useful to check if the codec suports the
     // sample rate, but it is not strictly needed for now
     bool isSupported = false;
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100)
     if (acodec->supported_samplerates)
     {
         for (int i = 0; acodec->supported_samplerates[i]; ++i)
         {
             if (acodec->supported_samplerates[i] == sampleRate)
+#else
+    const int *supported_samplerates = NULL;
+    int num_supported_samplerates = 0;
+    if (acodec) {
+        avcodec_get_supported_config(aenc, acodec, AV_CODEC_CONFIG_SAMPLE_RATE, 0,
+                                     (const void **) &supported_samplerates, &num_supported_samplerates);
+        for (int i = 0; i < num_supported_samplerates; i++)
+        {
+            if (supported_samplerates[i] == sampleRate)
+#endif
             {
                 isSupported = true;
                 break;
             }
         }
     }
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100)
     if (!isSupported && acodec->supported_samplerates) return MRET_ERR_NOCODEC;
+#else
+    if (!isSupported && num_supported_samplerates) return MRET_ERR_NOCODEC;
+#endif
 #if LIBAVCODEC_VERSION_MAJOR >= 60
     av_channel_layout_from_mask(&(aenc->ch_layout), AV_CH_LAYOUT_STEREO);
 #else
@@ -226,6 +250,9 @@ recording::MediaRet recording::MediaRecorder::setup_video_stream_info(int width,
 {
     switch (depth)
     {
+        case 8:
+            pixfmt = AV_PIX_FMT_RGB8;
+            break;
         case 16:
             // FIXME: test & make endian-neutral
             pixfmt = AV_PIX_FMT_RGB565LE;
@@ -250,6 +277,9 @@ recording::MediaRet recording::MediaRecorder::setup_video_stream_info(int width,
     linesize = pixsize * width;
     switch (pixsize)
     {
+        case 1:
+            tbord = 1; rbord = 4;
+            break;
         case 2:
             // 16-bit: 2 @ right, 1 @ top
             tbord = 1; rbord = 2;
@@ -455,7 +485,9 @@ void recording::MediaRecorder::Stop(bool initSuccess)
     if (enc)
     {
         avcodec_free_context(&enc);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100)
         avcodec_close(enc);
+#endif
         enc = NULL;
     }
     if (vcodec)
@@ -504,7 +536,9 @@ void recording::MediaRecorder::Stop(bool initSuccess)
     if (aenc)
     {
         avcodec_free_context(&aenc);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100)
         avcodec_close(aenc);
+#endif
         aenc = NULL;
     }
     samplesCount = 0;
@@ -618,7 +652,7 @@ recording::MediaRet recording::MediaRecorder::AddFrame(const uint16_t *aud, int
         return MRET_ERR_RECORDING;
     }
 
-    int dst_nb_samples = av_rescale_rnd(swr_get_delay(swr, c->sample_rate) + audioframeTmp->nb_samples, c->sample_rate, c->sample_rate, AV_ROUND_UP);
+    int64_t dst_nb_samples = av_rescale_rnd(swr_get_delay(swr, c->sample_rate) + audioframeTmp->nb_samples, c->sample_rate, c->sample_rate, AV_ROUND_UP);
     av_assert0(dst_nb_samples == audioframeTmp->nb_samples);
 
     if (swr_convert(swr, audioframe->data, audioframe->nb_samples, (const uint8_t **)audioframeTmp->data, audioframeTmp->nb_samples) < 0)

src/components/av_recording/av_recording.h

@@ -105,7 +105,7 @@ class MediaRecorder
         const AVCodec *acodec;
         AVStream *ast;
         AVCodecContext *aenc;
-        int samplesCount; // for audio frame pts generation
+        int64_t samplesCount; // for audio frame pts generation
         AVFrame *audioframe;
         AVFrame *audioframeTmp;
         // audio buffer

src/components/draw_text/draw_text.cpp

@@ -58,7 +58,7 @@ void drawText(uint8_t* screen, int pitch, int x, int y,
             char c = *string++;
             uint8_t* scr = screen;
 
-            uint16_t mask = ~RGB_LOW_BITS_MASK;
+            uint16_t mask = (uint16_t)(~RGB_LOW_BITS_MASK);
             int h, w;
             uint16_t* s = (uint16_t*)scr;
             for (h = 0; h < 8; h++) {

src/components/filters/filters.h

@@ -45,11 +45,11 @@ void lq2x(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp,
 // in any case, they are worthless, since all renderers do "simple" or
 // better by default
 void Simple2x32(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
-void Simple2x(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
+void Simple2x16(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
 void Simple3x32(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
-void Simple3x(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
+void Simple3x16(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
 void Simple4x32(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
-void Simple4x(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
+void Simple4x16(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
 // note: 16-bit input for asm version only!
 void hq3x32(uint8_t* src, uint32_t spitch, uint8_t*, uint8_t* dst, uint32_t dstp, int w, int h);
 // this takes 32-bit input

src/components/filters/internal/2xSaI.cpp

@@ -620,7 +620,7 @@ void SuperEagle (uint8_t *srcPtr, uint32_t srcPitch, uint8_t *deltaPtr,
 
         *((uint32_t *) dP) = product1a;
         *((uint32_t *) (dP + dstPitch)) = product2a;
-        *xP = color5;
+        *xP = (uint16_t)color5;
 
         bP += inc_bP;
         xP += inc_bP;
@@ -1169,7 +1169,7 @@ void Scale_2xSaI (uint8_t *srcPtr, uint32_t srcPitch, uint8_t * /* deltaPtr */,
       uint32_t E, F, G, H;
       uint32_t I, J, K, L;
       uint32_t x1, x2, a1, f1, f2;
-      uint32_t position, product1;
+      uint32_t position, product1 = 0;
 
       position = w >> 16;
       A = bP[position]; // current pixel

src/components/filters_agb/filters_agb.cpp

@@ -1,205 +1,358 @@
+/*
+ * GBA Color Correction Shader Implementation
+ *
+ * Shader modified by Pokefan531.
+ * Color Mangler
+ * Original Author: hunterk
+ * Original License: Public domain
+ *
+ * This code is adapted from the original shader logic.
+ */
+
 #include "components/filters_agb/filters_agb.h"
+#include <cmath>
+#include <algorithm>
 
 extern int systemColorDepth;
 extern int systemRedShift;
 extern int systemGreenShift;
 extern int systemBlueShift;
 
+extern uint8_t  systemColorMap8[0x10000];
 extern uint16_t systemColorMap16[0x10000];
 extern uint32_t systemColorMap32[0x10000];
 
-static const unsigned char curve[32] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0e, 0x10, 0x12,
-    0x14, 0x16, 0x18, 0x1c, 0x20, 0x28, 0x30, 0x38,
-    0x40, 0x48, 0x50, 0x58, 0x60, 0x68, 0x70, 0x80,
-    0x88, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0 };
+// --- Global Constants and Variables for GBA Color Correction ---
+// Define the color profile matrix as a static const float 2D array
+// This replicates the column-major order of GLSL mat4 for easier translation.
+// Format: { {col0_row0, col0_row1, col0_row2, col0_row3}, ... }
+static const float GBA_sRGB[4][4] = {
+    {0.905f, 0.10f, 0.1575f, 0.0f}, // Column 0 (R output contributions from R, G, B, A)
+    {0.195f, 0.65f, 0.1425f, 0.0f}, // Column 1 (G output contributions from R, G, B, A)
+    {-0.10f, 0.25f, 0.70f,   0.0f}, // Column 2 (B output contributions from R, G, B, A)
+    {0.0f,   0.0f,  0.0f,    0.91f} // Column 3 (A/Luminance contribution)
+};
 
-//								output           R   G   B
-static const unsigned char influence[3 * 3] = { 16, 4, 4, // red
-    8, 16, 8, // green
-    0, 8, 16 }; // blue
+static const float GBA_DCI[4][4] = {
+    {0.76f,  0.125f,  0.16f, 0.0f},
+    {0.27f,  0.6375f, 0.18f, 0.0f},
+    {-0.03f, 0.2375f, 0.66f, 0.0f},
+    {0.0f,   0.0f,    0.0f,  0.97f}
+};
 
-inline void swap(short& a, short& b)
-{
-    short temp = a;
-    a = b;
-    b = temp;
+static const float GBA_Rec2020[4][4] = {
+    {0.61f,  0.155f, 0.16f,   0.0f},
+    {0.345f, 0.615f, 0.1875f, 0.0f},
+    {0.045f, 0.23f,  0.6525f, 0.0f},
+    {0.0f,   0.0f,   0.0f,    1.0f}
+};
+
+// Screen darkening factor. Default to 0.0f
+static float darken_screen = 0.0f;
+
+// Color mode (0 for sRGB, 1 for DCI, 2 for Rec2020). Default to sRGB (0).
+static int color_mode = 0;
+
+// Pointer to the currently selected color profile matrix.
+static const float (*profile)[4];
+
+// Global constants from the shader for gamma correction values
+static const float target_gamma = 2.2f;
+static const float display_gamma = 2.2f;
+
+
+// --- Function Implementations ---
+
+// Forward declaration of a helper function to set the profile based on color_mode
+static void set_profile_from_mode();
+
+// This constructor-like function runs once when the program starts.
+struct GbafilterInitializer {
+    GbafilterInitializer() {
+        set_profile_from_mode();
+    }
+};
+static GbafilterInitializer __gbafilter_initializer;
+
+
+// Helper function to set the 'profile' pointer based on the 'color_mode' variable.
+static void set_profile_from_mode() {
+    if (color_mode == 0) {
+        profile = GBA_sRGB;
+    }
+    else if (color_mode == 1) {
+        profile = GBA_DCI;
+    }
+    else if (color_mode == 2) {
+        profile = GBA_Rec2020;
+    }
+    else {
+        profile = GBA_sRGB; // Default to sRGB if an invalid mode is set
+    }
+}
+
+
+// Public function to set color mode and darken screen from external calls
+void gbafilter_set_params(int new_color_mode, float new_darken_screen) {
+    color_mode = new_color_mode;
+    darken_screen = fmaxf(0.0f, fminf(1.0f, new_darken_screen)); // Clamp to 0.0-1.0
+
+    // Call the helper to update 'profile' based on the new 'color_mode'
+    set_profile_from_mode();
 }
 
 void gbafilter_update_colors(bool lcd) {
     switch (systemColorDepth) {
-        case 16: {
-            for (int i = 0; i < 0x10000; i++) {
-                systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
-                                      (((i & 0x3e0) >> 5) << systemGreenShift) |
-                                      (((i & 0x7c00) >> 10) << systemBlueShift);
-            }
-            if (lcd)
-                gbafilter_pal(systemColorMap16, 0x10000);
-        } break;
-        case 24:
-        case 32: {
-            for (int i = 0; i < 0x10000; i++) {
-                systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
-                                      (((i & 0x3e0) >> 5) << systemGreenShift) |
-                                      (((i & 0x7c00) >> 10) << systemBlueShift);
-            }
-            if (lcd)
-                gbafilter_pal32(systemColorMap32, 0x10000);
-        } break;
+    case 8: {
+        for (int i = 0; i < 0x10000; i++) {
+            systemColorMap8[i] = (uint8_t)((((i & 0x1f) << 3) & 0xE0) |
+                ((((i & 0x3e0) >> 5) << 0) & 0x1C) |
+                ((((i & 0x7c00) >> 10) >> 3) & 0x3));
+        }
+        if (lcd)
+            gbafilter_pal8(systemColorMap8, 0x10000);
+    } break;
+    case 16: {
+        for (int i = 0x0; i < 0x10000; i++) {
+            systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
+                (((i & 0x3e0) >> 5) << systemGreenShift) |
+                (((i & 0x7c00) >> 10) << systemBlueShift);
+        }
+        if (lcd)
+            gbafilter_pal(systemColorMap16, 0x10000);
+    } break;
+    case 24:
+    case 32: {
+        for (int i = 0; i < 0x10000; i++) {
+            systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
+                (((i & 0x3e0) >> 5) << systemGreenShift) |
+                (((i & 0x7c00) >> 10) << systemBlueShift);
+        }
+        if (lcd)
+            gbafilter_pal32(systemColorMap32, 0x10000);
+    } break;
+    }
+}
+
+void gbafilter_pal8(uint8_t* buf, int count)
+{
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + darken_screen;
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
+
+    while (count--) {
+        uint8_t pix = *buf;
+
+        uint8_t original_r_val_3bit = (uint8_t)((pix & 0xE0) >> 5);
+        uint8_t original_g_val_3bit = (uint8_t)((pix & 0x1C) >> 2);
+        uint8_t original_b_val_2bit = (uint8_t)(pix & 0x3);
+
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_3bit / 7.0f;
+        float g = (float)original_g_val_3bit / 7.0f;
+        float b = (float)original_b_val_2bit / 3.0f;
+
+        // 1. Apply initial gamma (including darken_screen as exponent) to convert to linear space.
+        // This step will affect non-"white" values.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
+
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
+
+        // 3. Apply color profile matrix (using profile[column][row] access)
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
+
+        // 4. Apply display gamma to convert back for display.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
+
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
+
+        // Convert back to 3-bit or 2-bit (0-7 or 0-3) integer and combine into uint8_t
+        // Apply 5-bit to 5-bit conversion, as this palette is for 16-bit output.
+        uint8_t final_red = (uint8_t)(transformed_r * 7.0f + 0.5f);
+        uint8_t final_green = (uint8_t)(transformed_g * 7.0f + 0.5f);
+        uint8_t final_blue = (uint8_t)(transformed_b * 3.0f + 0.5f);
+
+        // Ensure values are strictly within 0-7 or 0-3 range after rounding
+        if (final_red > 7) final_red = 7;
+        if (final_green > 7) final_green = 7;
+        if (final_blue > 3) final_blue = 3;
+
+        *buf++ = ((final_red & 0x7) << 5) |
+            ((final_green & 0x7) << 2) |
+            (final_blue & 0x3);
     }
 }
 
 void gbafilter_pal(uint16_t* buf, int count)
 {
-    short temp[3 * 3], s;
-    uint16_t pix;
-    uint8_t red, green, blue;
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + darken_screen;
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
 
     while (count--) {
-        pix = *buf;
+        uint16_t pix = *buf;
 
-        s = curve[(pix >> systemGreenShift) & 0x1f];
-        temp[3] = s * influence[3];
-        temp[4] = s * influence[4];
-        temp[5] = s * influence[5];
+        uint8_t original_r_val_5bit = (uint8_t)((pix >> systemRedShift) & 0x1f);
+        uint8_t original_g_val_5bit = (uint8_t)((pix >> systemGreenShift) & 0x1f);
+        uint8_t original_b_val_5bit = (uint8_t)((pix >> systemBlueShift) & 0x1f);
 
-        s = curve[(pix >> systemRedShift) & 0x1f];
-        temp[0] = s * influence[0];
-        temp[1] = s * influence[1];
-        temp[2] = s * influence[2];
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_5bit / 31.0f;
+        float g = (float)original_g_val_5bit / 31.0f;
+        float b = (float)original_b_val_5bit / 31.0f;
 
-        s = curve[(pix >> systemBlueShift) & 0x1f];
-        temp[6] = s * influence[6];
-        temp[7] = s * influence[7];
-        temp[8] = s * influence[8];
+        // 1. Apply initial gamma (including darken_screen as exponent) to convert to linear space.
+        // This step will affect non-"white" values.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
 
-        if (temp[0] < temp[3])
-            swap(temp[0], temp[3]);
-        if (temp[0] < temp[6])
-            swap(temp[0], temp[6]);
-        if (temp[3] < temp[6])
-            swap(temp[3], temp[6]);
-        temp[3] <<= 1;
-        temp[0] <<= 2;
-        temp[0] += temp[3] + temp[6];
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
 
-        red = ((int(temp[0]) * 160) >> 17) + 4;
-        if (red > 31)
-            red = 31;
+        // 3. Apply color profile matrix (using profile[column][row] access)
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
 
-        if (temp[2] < temp[5])
-            swap(temp[2], temp[5]);
-        if (temp[2] < temp[8])
-            swap(temp[2], temp[8]);
-        if (temp[5] < temp[8])
-            swap(temp[5], temp[8]);
-        temp[5] <<= 1;
-        temp[2] <<= 2;
-        temp[2] += temp[5] + temp[8];
+        // 4. Apply display gamma to convert back for display.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
 
-        blue = ((int(temp[2]) * 160) >> 17) + 4;
-        if (blue > 31)
-            blue = 31;
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
 
-        if (temp[1] < temp[4])
-            swap(temp[1], temp[4]);
-        if (temp[1] < temp[7])
-            swap(temp[1], temp[7]);
-        if (temp[4] < temp[7])
-            swap(temp[4], temp[7]);
-        temp[4] <<= 1;
-        temp[1] <<= 2;
-        temp[1] += temp[4] + temp[7];
+        // Convert back to 5-bit (0-31) integer and combine into uint16_t
+        // Apply 5-bit to 5-bit conversion, as this palette is for 16-bit output.
+        uint8_t final_red = (uint8_t)(transformed_r * 31.0f + 0.5f);
+        uint8_t final_green = (uint8_t)(transformed_g * 31.0f + 0.5f);
+        uint8_t final_blue = (uint8_t)(transformed_b * 31.0f + 0.5f);
 
-        green = ((int(temp[1]) * 160) >> 17) + 4;
-        if (green > 31)
-            green = 31;
+        // Ensure values are strictly within 0-31 range after rounding
+        if (final_red > 31) final_red = 31;
+        if (final_green > 31) final_green = 31;
+        if (final_blue > 31) final_blue = 31;
 
-        pix = red << systemRedShift;
-        pix += green << systemGreenShift;
-        pix += blue << systemBlueShift;
-
-        *buf++ = pix;
+        *buf++ = (final_red << systemRedShift) |
+            (final_green << systemGreenShift) |
+            (final_blue << systemBlueShift);
     }
 }
 
 void gbafilter_pal32(uint32_t* buf, int count)
 {
-    short temp[3 * 3], s;
-    unsigned pix;
-    uint8_t red, green, blue;
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + darken_screen;
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
 
     while (count--) {
-        pix = *buf;
+        uint32_t pix = *buf;
 
-        s = curve[(pix >> systemGreenShift) & 0x1f];
-        temp[3] = s * influence[3];
-        temp[4] = s * influence[4];
-        temp[5] = s * influence[5];
+        // Extract original 5-bit R, G, B values from the shifted positions in the 32-bit pixel.
+        // These shifts pull out the 5-bit value from its shifted position (e.g., bits 3-7 for Red).
+        uint8_t original_r_val_5bit = (uint8_t)((pix >> systemRedShift) & 0x1f);
+        uint8_t original_g_val_5bit = (uint8_t)((pix >> systemGreenShift) & 0x1f);
+        uint8_t original_b_val_5bit = (uint8_t)((pix >> systemBlueShift) & 0x1f);
 
-        s = curve[(pix >> systemRedShift) & 0x1f];
-        temp[0] = s * influence[0];
-        temp[1] = s * influence[1];
-        temp[2] = s * influence[2];
 
-        s = curve[(pix >> systemBlueShift) & 0x1f];
-        temp[6] = s * influence[6];
-        temp[7] = s * influence[7];
-        temp[8] = s * influence[8];
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_5bit / 31.0f;
+        float g = (float)original_g_val_5bit / 31.0f;
+        float b = (float)original_b_val_5bit / 31.0f;
 
-        if (temp[0] < temp[3])
-            swap(temp[0], temp[3]);
-        if (temp[0] < temp[6])
-            swap(temp[0], temp[6]);
-        if (temp[3] < temp[6])
-            swap(temp[3], temp[6]);
-        temp[3] <<= 1;
-        temp[0] <<= 2;
-        temp[0] += temp[3] + temp[6];
+        // 1. Apply initial gamma (including darken_screen as exponent) to convert to linear space.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
 
-        //red = ((int(temp[0]) * 160) >> 17) + 4;
-        red = ((int(temp[0]) * 160) >> 14) + 32;
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
 
-        if (temp[2] < temp[5])
-            swap(temp[2], temp[5]);
-        if (temp[2] < temp[8])
-            swap(temp[2], temp[8]);
-        if (temp[5] < temp[8])
-            swap(temp[5], temp[8]);
-        temp[5] <<= 1;
-        temp[2] <<= 2;
-        temp[2] += temp[5] + temp[8];
+        // 3. Apply color profile matrix
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
 
-        //blue = ((int(temp[2]) * 160) >> 17) + 4;
-        blue = ((int(temp[2]) * 160) >> 14) + 32;
+        // 4. Apply display gamma.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
 
-        if (temp[1] < temp[4])
-            swap(temp[1], temp[4]);
-        if (temp[1] < temp[7])
-            swap(temp[1], temp[7]);
-        if (temp[4] < temp[7])
-            swap(temp[4], temp[7]);
-        temp[4] <<= 1;
-        temp[1] <<= 2;
-        temp[1] += temp[4] + temp[7];
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
 
-        //green = ((int(temp[1]) * 160) >> 17) + 4;
-        green = ((int(temp[1]) * 160) >> 14) + 32;
 
-        //pix  = red << redshift;
-        //pix += green << greenshift;
-        //pix += blue << blueshift;
+        // Convert the floating-point values to 8-bit integer components (0-255).
+        uint8_t final_red_8bit = (uint8_t)(transformed_r * 255.0f + 0.5f);
+        uint8_t final_green_8bit = (uint8_t)(transformed_g * 255.0f + 0.5f);
+        uint8_t final_blue_8bit = (uint8_t)(transformed_b * 255.0f + 0.5f);
 
-        pix = red << (systemRedShift - 3);
-        pix += green << (systemGreenShift - 3);
-        pix += blue << (systemBlueShift - 3);
+        // Ensure values are strictly within 0-255 range after rounding
+        if (final_red_8bit > 255) final_red_8bit = 255;
+        if (final_green_8bit > 255) final_green_8bit = 255;
+        if (final_blue_8bit > 255) final_blue_8bit = 255;
 
-        *buf++ = pix;
+        // --- NEW PACKING LOGIC ---
+        // This is the critical change to correctly map 8-bit color to the 5-bit shifted format,
+        // while allowing FFFFFF.
+        // It uses the top 5 bits of the 8-bit value for the GBA's 5-bit component position,
+        // and the bottom 3 bits to fill the lower, normally zeroed, positions.
+
+        uint32_t final_pix = 0;
+
+        // Red component
+        // 5 most significant bits (MSBs) for the 'systemRedShift' position
+        final_pix |= ((final_red_8bit >> 3) & 0x1f) << systemRedShift;
+        // 3 least significant bits (LSBs) for the 'base' position (systemRedShift - 3)
+        final_pix |= (final_red_8bit & 0x07) << (systemRedShift - 3);
+
+
+        // Green component
+        // 5 MSBs for the 'systemGreenShift' position
+        final_pix |= ((final_green_8bit >> 3) & 0x1f) << systemGreenShift;
+        // 3 LSBs for the 'base' position (systemGreenShift - 3)
+        final_pix |= (final_green_8bit & 0x07) << (systemGreenShift - 3);
+
+        // Blue component
+        // 5 MSBs for the 'systemBlueShift' position
+        final_pix |= ((final_blue_8bit >> 3) & 0x1f) << systemBlueShift;
+        // 3 LSBs for the 'base' position (systemBlueShift - 3)
+        final_pix |= (final_blue_8bit & 0x07) << (systemBlueShift - 3);
+
+        // Preserve existing alpha if present (assuming it's at bits 24-31 for 32-bit depth)
+        if (systemColorDepth == 32) {
+            final_pix |= (pix & (0xFF << 24));
+        }
+
+        *buf++ = final_pix;
     }
 }
 
-// for palette mode to work with the three spoony filters in 32bpp depth
-
+// gbafilter_pad remains unchanged as it's for masking.
 void gbafilter_pad(uint8_t* buf, int count)
 {
     union {
@@ -232,32 +385,3 @@ void gbafilter_pad(uint8_t* buf, int count)
         }
     }
 }
-
-/*
-void UpdateSystemColorMaps(int lcd)
-{
-  switch(systemColorDepth) {
-  case 16:
-    {
-      for(int i = 0; i < 0x10000; i++) {
-        systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
-          (((i & 0x3e0) >> 5) << systemGreenShift) |
-          (((i & 0x7c00) >> 10) << systemBlueShift);
-      }
-	  if (lcd == 1) gbafilter_pal(systemColorMap16, 0x10000);
-    }
-    break;
-  case 24:
-  case 32:
-    {
-      for(int i = 0; i < 0x10000; i++) {
-        systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
-          (((i & 0x3e0) >> 5) << systemGreenShift) |
-          (((i & 0x7c00) >> 10) << systemBlueShift);
-      }
-	  if (lcd == 1) gbafilter_pal32(systemColorMap32, 0x10000);
-    }
-    break;
-  }
-}
-*/

src/components/filters_agb/filters_agb.h

@@ -4,8 +4,10 @@
 #include <cstdint>
 
 void gbafilter_update_colors(bool lcd = false);
+void gbafilter_pal8(uint8_t* buf, int count);
 void gbafilter_pal(uint16_t* buf, int count);
 void gbafilter_pal32(uint32_t* buf, int count);
 void gbafilter_pad(uint8_t* buf, int count);
+void gbafilter_set_params(int color_mode, float darken_screen);
 
 #endif  // VBAM_COMPONENTS_FILTERS_AGB_FILTERS_AGB_H_

src/components/filters_cgb/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(vbam-components-filters-cgb OBJECT)
+
+target_sources(vbam-components-filters-cgb
+    PRIVATE filters_cgb.cpp
+    PUBLIC filters_cgb.h
+)

src/components/filters_cgb/filters_cgb.cpp

@@ -0,0 +1,386 @@
+/*
+ * GBC Color Correction Shader Implementation
+ *
+ * Shader modified by Pokefan531.
+ * Color Mangler
+ * Original Author: hunterk
+ * Original License: Public domain
+ *
+ * This code is adapted from the original shader logic.
+ */
+
+#include "components/filters_cgb/filters_cgb.h"
+#include <cmath>
+#include <algorithm>
+
+extern int systemColorDepth;
+extern int systemRedShift;
+extern int systemGreenShift;
+extern int systemBlueShift;
+
+extern uint8_t  systemColorMap8[0x10000];
+extern uint16_t systemColorMap16[0x10000];
+extern uint32_t systemColorMap32[0x10000];
+
+// --- Global Constants and Variables for GBC Color Correction ---
+// Define the color profile matrix as a static const float 2D array
+// This replicates the column-major order of GLSL mat4 for easier translation.
+// Format: { {col0_row0, col0_row1, col0_row2, col0_row3}, ... }
+static const float GBC_sRGB[4][4] = {
+    {0.905f, 0.10f, 0.1575f, 0.0f}, // Column 0 (R output contributions from R, G, B, A)
+    {0.195f, 0.65f, 0.1425f, 0.0f}, // Column 1 (G output contributions from R, G, B, A)
+    {-0.10f, 0.25f, 0.70f,   0.0f}, // Column 2 (B output contributions from R, G, B, A)
+    {0.0f,   0.0f,  0.0f,    0.91f} // Column 3 (A/Luminance contribution)
+};
+
+static const float GBC_DCI[4][4] = {
+    {0.76f,  0.125f,  0.16f, 0.0f},
+    {0.27f,  0.6375f, 0.18f, 0.0f},
+    {-0.03f, 0.2375f, 0.66f, 0.0f},
+    {0.0f,   0.0f,    0.0f,  0.97f}
+};
+
+static const float GBC_Rec2020[4][4] = {
+    {0.61f,  0.155f, 0.16f,   0.0f},
+    {0.345f, 0.615f, 0.1875f, 0.0f},
+    {0.045f, 0.23f,  0.6525f, 0.0f},
+    {0.0f,   0.0f,   0.0f,    1.0f}
+};
+
+// Screen lightening factor. Default to 0.0f.
+static float lighten_screen = 0.0f;
+
+// Color mode (0 for sRGB, 1 for DCI, 2 for Rec2020). Default to sRGB (0).
+static int color_mode = 0;
+
+// Pointer to the currently selected color profile matrix.
+static const float (*profile)[4];
+
+// Global constants from the shader for gamma correction values
+static const float target_gamma = 2.2f;
+static const float display_gamma = 2.2f;
+
+
+// --- Function Implementations ---
+
+// Forward declaration of a helper function to set the profile based on color_mode
+static void set_profile_from_mode();
+
+// This constructor-like function runs once when the program starts.
+struct GbcfilterInitializer {
+    GbcfilterInitializer() {
+        set_profile_from_mode();
+    }
+};
+static GbcfilterInitializer __gbcfilter_initializer;
+
+
+// Helper function to set the 'profile' pointer based on the 'color_mode' variable.
+static void set_profile_from_mode() {
+    if (color_mode == 0) {
+        profile = GBC_sRGB;
+    }
+    else if (color_mode == 1) {
+        profile = GBC_DCI;
+    }
+    else if (color_mode == 2) {
+        profile = GBC_Rec2020;
+    }
+    else {
+        profile = GBC_sRGB; // Default to sRGB if an invalid mode is set
+    }
+}
+
+
+// Public function to set color mode and darken screen from external calls
+void gbcfilter_set_params(int new_color_mode, float new_lighten_screen) {
+    color_mode = new_color_mode;
+    lighten_screen = fmaxf(0.0f, fminf(1.0f, new_lighten_screen)); // Clamp to 0.0-1.0
+
+    // Call the helper to update 'profile' based on the new 'color_mode'
+    set_profile_from_mode();
+}
+
+void gbcfilter_update_colors(bool lcd) {
+    switch (systemColorDepth) {
+    case 8: {
+        for (int i = 0; i < 0x10000; i++) {
+            systemColorMap8[i] = (uint8_t)((((i & 0x1f) << 3) & 0xE0) |
+                ((((i & 0x3e0) >> 5) << 0) & 0x1C) |
+                ((((i & 0x7c00) >> 10) >> 3) & 0x3));
+        }
+        if (lcd)
+            gbcfilter_pal8(systemColorMap8, 0x10000);
+    } break;
+    case 16: {
+        for (int i = 0x0; i < 0x10000; i++) {
+            systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
+                (((i & 0x3e0) >> 5) << systemGreenShift) |
+                (((i & 0x7c00) >> 10) << systemBlueShift);
+        }
+        if (lcd)
+            gbcfilter_pal(systemColorMap16, 0x10000);
+    } break;
+    case 24:
+    case 32: {
+        for (int i = 0; i < 0x10000; i++) {
+            systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
+                (((i & 0x3e0) >> 5) << systemGreenShift) |
+                (((i & 0x7c00) >> 10) << systemBlueShift);
+        }
+        if (lcd)
+            gbcfilter_pal32(systemColorMap32, 0x10000);
+    } break;
+    }
+}
+
+void gbcfilter_pal8(uint8_t* buf, int count)
+{
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + (lighten_screen * -1.0f);
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
+
+    while (count--) {
+        uint8_t pix = *buf;
+
+        uint8_t original_r_val_3bit = (uint8_t)((pix & 0xE0) >> 5);
+        uint8_t original_g_val_3bit = (uint8_t)((pix & 0x1C) >> 2);
+        uint8_t original_b_val_2bit = (uint8_t)(pix & 0x3);
+
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_3bit / 7.0f;
+        float g = (float)original_g_val_3bit / 7.0f;
+        float b = (float)original_b_val_2bit / 3.0f;
+
+        // 1. Apply initial gamma (including lighten_screen as exponent) to convert to linear space.
+        // This step will affect non-"white" values.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
+
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
+
+        // 3. Apply color profile matrix (using profile[column][row] access)
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
+
+        // 4. Apply display gamma to convert back for display.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
+
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
+
+        // Convert back to 3-bit or 2-bit (0-7 or 0-3) integer and combine into uint8_t
+        // Apply 3-bit or 2-bit to 8-bit conversion, as this palette is for 8-bit output.
+        uint8_t final_red = (uint8_t)(transformed_r * 7.0f + 0.5f);
+        uint8_t final_green = (uint8_t)(transformed_g * 7.0f + 0.5f);
+        uint8_t final_blue = (uint8_t)(transformed_b * 3.0f + 0.5f);
+
+        // Ensure values are strictly within 0-7 or 0-3 range after rounding
+        if (final_red > 7) final_red = 7;
+        if (final_green > 7) final_green = 7;
+        if (final_blue > 3) final_blue = 3;
+
+        *buf++ = ((final_red & 0x7) << 5) |
+            ((final_green & 0x7) << 2) |
+            (final_blue & 0x3);
+    }
+}
+void gbcfilter_pal(uint16_t* buf, int count)
+{
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + (lighten_screen * -1.0f);
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
+
+    while (count--) {
+        uint16_t pix = *buf;
+
+        uint8_t original_r_val_5bit = (uint8_t)((pix >> systemRedShift) & 0x1f);
+        uint8_t original_g_val_5bit = (uint8_t)((pix >> systemGreenShift) & 0x1f);
+        uint8_t original_b_val_5bit = (uint8_t)((pix >> systemBlueShift) & 0x1f);
+
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_5bit / 31.0f;
+        float g = (float)original_g_val_5bit / 31.0f;
+        float b = (float)original_b_val_5bit / 31.0f;
+
+        // 1. Apply initial gamma (including lighten_screen as exponent) to convert to linear space.
+        // This step will affect non-"white" values.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
+
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
+
+        // 3. Apply color profile matrix (using profile[column][row] access)
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
+
+        // 4. Apply display gamma to convert back for display.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
+
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
+
+        // Convert back to 5-bit (0-31) integer and combine into uint16_t
+        // Apply 5-bit to 5-bit conversion, as this palette is for 16-bit output.
+        uint8_t final_red = (uint8_t)(transformed_r * 31.0f + 0.5f);
+        uint8_t final_green = (uint8_t)(transformed_g * 31.0f + 0.5f);
+        uint8_t final_blue = (uint8_t)(transformed_b * 31.0f + 0.5f);
+
+        // Ensure values are strictly within 0-31 range after rounding
+        if (final_red > 31) final_red = 31;
+        if (final_green > 31) final_green = 31;
+        if (final_blue > 31) final_blue = 31;
+
+        *buf++ = (final_red << systemRedShift) |
+            (final_green << systemGreenShift) |
+            (final_blue << systemBlueShift);
+    }
+}
+
+void gbcfilter_pal32(uint32_t* buf, int count)
+{
+    // Pre-calculate constants for efficiency within function scope
+    const float target_gamma_exponent = target_gamma + (lighten_screen * -1.0f);
+    const float display_gamma_reciprocal = 1.0f / display_gamma;
+    const float luminance_factor = profile[3][3]; // profile[3].w from GLSL
+
+    while (count--) {
+        uint32_t pix = *buf;
+
+        // Extract original 5-bit R, G, B values from the shifted positions in the 32-bit pixel.
+        // These shifts pull out the 5-bit value from its shifted position (e.g., bits 3-7 for Red).
+        uint8_t original_r_val_5bit = (uint8_t)((pix >> systemRedShift) & 0x1f);
+        uint8_t original_g_val_5bit = (uint8_t)((pix >> systemGreenShift) & 0x1f);
+        uint8_t original_b_val_5bit = (uint8_t)((pix >> systemBlueShift) & 0x1f);
+
+
+        // Normalize to 0.0-1.0 for calculations
+        float r = (float)original_r_val_5bit / 31.0f;
+        float g = (float)original_g_val_5bit / 31.0f;
+        float b = (float)original_b_val_5bit / 31.0f;
+
+        // 1. Apply initial gamma (including lighten_screen as exponent) to convert to linear space.
+        r = powf(r, target_gamma_exponent);
+        g = powf(g, target_gamma_exponent);
+        b = powf(b, target_gamma_exponent);
+
+        // 2. Apply luminance factor and clamp.
+        r = fmaxf(0.0f, fminf(1.0f, r * luminance_factor));
+        g = fmaxf(0.0f, fminf(1.0f, g * luminance_factor));
+        b = fmaxf(0.0f, fminf(1.0f, b * luminance_factor));
+
+        // 3. Apply color profile matrix
+        float transformed_r = profile[0][0] * r + profile[1][0] * g + profile[2][0] * b;
+        float transformed_g = profile[0][1] * r + profile[1][1] * g + profile[2][1] * b;
+        float transformed_b = profile[0][2] * r + profile[1][2] * g + profile[2][2] * b;
+
+        // 4. Apply display gamma.
+        transformed_r = copysignf(powf(fabsf(transformed_r), display_gamma_reciprocal), transformed_r);
+        transformed_g = copysignf(powf(fabsf(transformed_g), display_gamma_reciprocal), transformed_g);
+        transformed_b = copysignf(powf(fabsf(transformed_b), display_gamma_reciprocal), transformed_b);
+
+        // Final clamp: ensure values are within 0.0-1.0 range
+        transformed_r = fmaxf(0.0f, fminf(1.0f, transformed_r));
+        transformed_g = fmaxf(0.0f, fminf(1.0f, transformed_g));
+        transformed_b = fmaxf(0.0f, fminf(1.0f, transformed_b));
+
+
+        // Convert the floating-point values to 8-bit integer components (0-255).
+        uint8_t final_red_8bit = (uint8_t)(transformed_r * 255.0f + 0.5f);
+        uint8_t final_green_8bit = (uint8_t)(transformed_g * 255.0f + 0.5f);
+        uint8_t final_blue_8bit = (uint8_t)(transformed_b * 255.0f + 0.5f);
+
+        // Ensure values are strictly within 0-255 range after rounding
+        if (final_red_8bit > 255) final_red_8bit = 255;
+        if (final_green_8bit > 255) final_green_8bit = 255;
+        if (final_blue_8bit > 255) final_blue_8bit = 255;
+
+        // --- NEW PACKING LOGIC ---
+        // This is the critical change to correctly map 8-bit color to the 5-bit shifted format,
+        // while allowing FFFFFF.
+        // It uses the top 5 bits of the 8-bit value for the GBC's 5-bit component position,
+        // and the bottom 3 bits to fill the lower, normally zeroed, positions.
+
+        uint32_t final_pix = 0;
+
+        // Red component
+        // 5 most significant bits (MSBs) for the 'systemRedShift' position
+        final_pix |= ((final_red_8bit >> 3) & 0x1f) << systemRedShift;
+        // 3 least significant bits (LSBs) for the 'base' position (systemRedShift - 3)
+        final_pix |= (final_red_8bit & 0x07) << (systemRedShift - 3);
+
+
+        // Green component
+        // 5 MSBs for the 'systemGreenShift' position
+        final_pix |= ((final_green_8bit >> 3) & 0x1f) << systemGreenShift;
+        // 3 LSBs for the 'base' position (systemGreenShift - 3)
+        final_pix |= (final_green_8bit & 0x07) << (systemGreenShift - 3);
+
+        // Blue component
+        // 5 MSBs for the 'systemBlueShift' position
+        final_pix |= ((final_blue_8bit >> 3) & 0x1f) << systemBlueShift;
+        // 3 LSBs for the 'base' position (systemBlueShift - 3)
+        final_pix |= (final_blue_8bit & 0x07) << (systemBlueShift - 3);
+
+        // Preserve existing alpha if present (assuming it's at bits 24-31 for 32-bit depth)
+        if (systemColorDepth == 32) {
+            final_pix |= (pix & (0xFF << 24));
+        }
+
+        *buf++ = final_pix;
+    }
+}
+
+// gbcfilter_pad remains unchanged as it's for masking.
+void gbcfilter_pad(uint8_t* buf, int count)
+{
+    union {
+        struct
+        {
+            uint8_t r;
+            uint8_t g;
+            uint8_t b;
+            uint8_t a;
+        } part;
+        unsigned whole;
+    } mask;
+
+    mask.whole = 0x1f << systemRedShift;
+    mask.whole += 0x1f << systemGreenShift;
+    mask.whole += 0x1f << systemBlueShift;
+
+    switch (systemColorDepth) {
+    case 24:
+        while (count--) {
+            *buf++ &= mask.part.r;
+            *buf++ &= mask.part.g;
+            *buf++ &= mask.part.b;
+        }
+        break;
+    case 32:
+        while (count--) {
+            *((uint32_t*)buf) &= mask.whole;
+            buf += 4;
+        }
+    }
+}

src/components/filters_cgb/filters_cgb.h

@@ -0,0 +1,13 @@
+#ifndef VBAM_COMPONENTS_FILTERS_CGB_FILTERS_CGB_H_
+#define VBAM_COMPONENTS_FILTERS_CGB_FILTERS_CGB_H_
+
+#include <cstdint>
+
+void gbcfilter_update_colors(bool lcd = false);
+void gbcfilter_pal8(uint8_t* buf, int count);
+void gbcfilter_pal(uint16_t* buf, int count);
+void gbcfilter_pal32(uint32_t* buf, int count);
+void gbcfilter_pad(uint8_t* buf, int count);
+void gbcfilter_set_params(int color_mode, float lighten_screen);
+
+#endif  // VBAM_COMPONENTS_FILTERS_CGB_FILTERS_CGB_H_

src/components/filters_interframe/interframe.cpp

@@ -159,6 +159,51 @@ static void SmartIB_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int start
 }
 #endif
 
+void SmartIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
+{
+  (void)width; // unused param
+  if(frm1 == NULL) {
+    InterframeFilterInit();
+  }
+
+  uint16_t colorMask = (uint16_t)(~RGB_LOW_BITS_MASK);
+
+  uint8_t *src0 = (uint8_t *)srcPtr + starty * srcPitch;
+  uint8_t *src1 = (uint8_t *)frm1 + srcPitch * starty;
+  uint8_t *src2 = (uint8_t *)frm2 + srcPitch * starty;
+  uint8_t *src3 = (uint8_t *)frm3 + srcPitch * starty;
+
+  int sPitch = srcPitch;
+
+  int pos = 0;
+  for (int j = 0; j < height;  j++)
+    for (int i = 0; i < sPitch; i++) {
+      uint16_t color = src0[pos] == 0xff ? 0x7fff : ((src0[pos] & 0xe0) << 7) | ((src0[pos] & 0x1c) << 5) | ((src0[pos] & 0x3) << 3);
+      uint16_t color2 = src1[pos] == 0xff ? 0x7fff : ((src1[pos] & 0xe0) << 7) | ((src1[pos] & 0x1c) << 5) | ((src1[pos] & 0x3) << 3);
+      uint16_t color_dst = ((color & colorMask) >> 1) + ((color2 & colorMask) >> 1);
+      src0[pos] =
+        (src1[pos] != src2[pos]) &&
+        (src3[pos] != color) &&
+        ((color == src2[pos]) || (src1[pos] == src3[pos]))
+        ? (uint8_t)(((color_dst >> 7) & 0xe0) | ((color_dst >> 5) & 0x1c) | ((color_dst >> 3) & 0x3)) :
+        (uint8_t)(((color >> 7) & 0xe0) | ((color >> 5) & 0x1c) | ((color >> 3) & 0x3));
+      src3[pos] = (uint8_t)(((color >> 7) & 0xe0) | ((color >> 5) & 0x1c) | ((color >> 3) & 0x3)); /* oldest buffer now holds newest frame */
+      pos++;
+    }
+
+    /* Swap buffers around */
+    uint8_t *temp = frm1;
+    frm1 = frm3;
+    frm3 = frm2;
+    frm2 = temp;
+
+}
+
+void SmartIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int height)
+{
+  SmartIB8(srcPtr, srcPitch, width, 0, height);
+}
+
 void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
   (void)width; // unused param
@@ -172,7 +217,7 @@ void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int heig
   }
 #endif
 
-  uint16_t colorMask = ~RGB_LOW_BITS_MASK;
+  uint16_t colorMask = (uint16_t)(~RGB_LOW_BITS_MASK);
 
   uint16_t *src0 = (uint16_t *)srcPtr + starty * srcPitch / 2;
   uint16_t *src1 = (uint16_t *)frm1 + srcPitch * starty / 2;
@@ -207,6 +252,64 @@ void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int height)
   SmartIB(srcPtr, srcPitch, width, 0, height);
 }
 
+void SmartIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
+{
+  (void)width; // unused param
+  if(frm1 == NULL) {
+    InterframeFilterInit();
+  }
+
+  uint8_t colorMask = 0xfe;
+
+  uint8_t *src0 = (uint8_t *)srcPtr + starty * srcPitch / 3;
+  uint8_t *src1 = (uint8_t *)frm1 + srcPitch * starty / 3;
+  uint8_t *src2 = (uint8_t *)frm2 + srcPitch * starty / 3;
+  uint8_t *src3 = (uint8_t *)frm3 + srcPitch * starty / 3;
+
+  int sPitch = srcPitch / 3;
+
+  int pos = 0;
+  for (int j = 0; j < height;  j++)
+    for (int i = 0; i < sPitch; i++) {
+      uint8_t color = src0[pos];
+      uint8_t color2 = src0[pos+1];
+      uint8_t color3 = src0[pos+2];
+      src0[pos] =
+        (src1[pos] != src2[pos]) &&
+        (src3[pos] != color) &&
+        ((color == src2[pos]) || (src1[pos] == src3[pos]))
+        ? (((color & colorMask) >> 1) + ((src1[pos] & colorMask) >> 1)) :
+        color;
+      src0[pos+1] =
+        (src1[pos+1] != src2[pos+1]) &&
+        (src3[pos+1] != color2) &&
+        ((color2 == src2[pos+1]) || (src1[pos+1] == src3[pos+1]))
+        ? (((color2 & colorMask) >> 1) + ((src1[pos+1] & colorMask) >> 1)) :
+        color2;
+      src0[pos+2] =
+        (src1[pos+2] != src2[pos+2]) &&
+          (src3[pos+2] != color3) &&
+          ((color3 == src2[pos+2]) || (src1[pos+1] == src3[pos+2]))
+          ? (((color3 & colorMask) >> 1) + ((src1[pos+2] & colorMask) >> 1)) :
+          color3;
+      src3[pos] = color; /* oldest buffer now holds newest frame */
+      src3[pos+1] = color2; /* oldest buffer now holds newest frame */
+      src3[pos+2] = color3; /* oldest buffer now holds newest frame */
+      pos += 3;
+    }
+
+  /* Swap buffers around */
+  uint8_t *temp = frm1;
+  frm1 = frm3;
+  frm3 = frm2;
+  frm2 = temp;
+}
+
+void SmartIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int height)
+{
+  SmartIB24(srcPtr, srcPitch, width, 0, height);
+}
+
 #ifdef MMX
 static void SmartIB32_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
@@ -443,6 +546,70 @@ static void MotionBlurIB_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int
 }
 #endif
 
+void MotionBlurIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
+{
+  (void)width; // unused param
+  if(frm1 == NULL) {
+    InterframeFilterInit();
+  }
+
+  uint8_t colorMask = 0xfe;
+
+  uint8_t *src0 = (uint8_t *)srcPtr + starty * srcPitch / 3;
+  uint8_t *src1 = (uint8_t *)frm1 + starty * srcPitch / 3;
+  int sPitch = srcPitch / 3;
+
+  int pos = 0;
+  for (int j = 0; j < height;  j++)
+    for (int i = 0; i < sPitch; i++) {
+      uint8_t color = src0[pos];
+      uint8_t color2 = src0[pos+1];
+      uint8_t color3 = src0[pos+2];
+      src0[pos] = ((color & colorMask) >> 1) + ((src1[pos] & colorMask) >> 1);
+      src0[pos+1] = ((color2 & colorMask) >> 1) + ((src1[pos+1] & colorMask) >> 1);
+      src0[pos+2] = ((color3 & colorMask) >> 1) + ((src1[pos+2] & colorMask) >> 1);
+      src1[pos] = color;
+      src1[pos+1] = color2;
+      src1[pos+2] = color3;
+      pos += 3;
+    }
+}
+
+void MotionBlurIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int height)
+{
+    MotionBlurIB24(srcPtr, srcPitch, width, 0, height);
+}
+
+void MotionBlurIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
+{
+  (void)width; // unused param
+  if(frm1 == NULL) {
+    InterframeFilterInit();
+  }
+
+  uint16_t colorMask = (uint16_t)(~RGB_LOW_BITS_MASK);
+
+  uint8_t *src0 = (uint8_t *)srcPtr + starty * srcPitch;
+  uint8_t *src1 = (uint8_t *)frm1 + starty * srcPitch;
+  int sPitch = srcPitch;
+
+  int pos = 0;
+  for (int j = 0; j < height;  j++)
+    for (int i = 0; i < sPitch; i++) {
+      uint16_t color = src0[pos] == 0xff ? 0x7fff : ((src0[pos] & 0xe0) << 7) | ((src0[pos] & 0x1c) << 5) | ((src0[pos] & 0x3) << 3);
+      uint16_t color2 = src1[pos] == 0xff ? 0x7fff : ((src1[pos] & 0xe0) << 7) | ((src1[pos] & 0x1c) << 5) | ((src1[pos] & 0x3) << 3);
+      uint16_t color_dst = ((color & colorMask) >> 1) + ((color2 & colorMask) >> 1);
+      src0[pos] = (uint8_t)(((color_dst >> 7) & 0xe0) | ((color_dst >> 5) & 0x1c) | ((color_dst >> 3) & 0x3));
+      src1[pos] = (uint8_t)(((color >> 7) & 0xe0) | ((color >> 5) & 0x1c) | ((color >> 3) & 0x3));
+      pos++;
+    }
+}
+
+void MotionBlurIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int height)
+{
+  MotionBlurIB8(srcPtr, srcPitch, width, 0, height);
+}
+
 void MotionBlurIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
   (void)width; // unused param
@@ -457,7 +624,7 @@ void MotionBlurIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int
   }
 #endif
 
-  uint16_t colorMask = ~RGB_LOW_BITS_MASK;
+  uint16_t colorMask = (uint16_t)(~RGB_LOW_BITS_MASK);
 
   uint16_t *src0 = (uint16_t *)srcPtr + starty * srcPitch / 2;
   uint16_t *src1 = (uint16_t *)frm1 + starty * srcPitch / 2;

src/components/filters_interframe/interframe.h

@@ -14,8 +14,12 @@ void InterframeCleanup();
 
 // all 4 are MMX-accelerated if enabled
 void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
+void SmartIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
+void SmartIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
 void SmartIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
 void MotionBlurIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
+void MotionBlurIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
+void MotionBlurIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
 void MotionBlurIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height);
 
 #ifdef MMX
@@ -27,8 +31,12 @@ static void MotionBlurIB32_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, in
 
 //Options for if start is 0
 void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
+void SmartIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
+void SmartIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
 void SmartIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
 void MotionBlurIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
+void MotionBlurIB8(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
+void MotionBlurIB24(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
 void MotionBlurIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int height);
 
 #endif  //VBAM_COMPONENTS_FILTERS_INTERFRAME_INTERFRAME_H_

src/components/user_config/user_config.cpp

@@ -13,8 +13,15 @@ std::string get_xdg_user_config_home()
     std::string home(getenv("HOME"));
     path = home + "/Library/Application Support";
 #elif _WIN32
+#if __STDC_WANT_SECURE_LIB__
+    char *app_data_env = NULL;
+    size_t app_data_env_sz = 0;
+    _dupenv_s(&app_data_env, &app_data_env_sz, "LOCALAPPDATA");
+    if (!app_data_env) _dupenv_s(&app_data_env, &app_data_env_sz, "APPDATA");
+#else
     char *app_data_env = getenv("LOCALAPPDATA");
     if (!app_data_env) app_data_env = getenv("APPDATA");
+#endif
     std::string app_data(app_data_env);
     path = app_data;
 #else // Unix
@@ -40,8 +47,15 @@ std::string get_xdg_user_data_home()
     std::string home(getenv("HOME"));
     path = home + "/Library/Application Support";
 #elif _WIN32
+#if __STDC_WANT_SECURE_LIB__
+    char *app_data_env = NULL;
+    size_t app_data_env_sz = 0;
+    _dupenv_s(&app_data_env, &app_data_env_sz, "LOCALAPPDATA");
+    if (!app_data_env) _dupenv_s(&app_data_env, &app_data_env_sz, "APPDATA");
+#else
     char *app_data_env = getenv("LOCALAPPDATA");
     if (!app_data_env) app_data_env = getenv("APPDATA");
+#endif
     std::string app_data(app_data_env);
     path = app_data;
 #else // Unix

src/core/CMakeLists.txt

@@ -93,7 +93,7 @@ target_include_directories(vbam-core
 )
 
 target_link_libraries(vbam-core
-    PRIVATE vbam-core-apu vbam-fex
+    PRIVATE vbam-core-apu vbam-fex nonstd-lib
     PUBLIC vbam-core-base ${ZLIB_LIBRARY}
 )
 
@@ -120,9 +120,7 @@ if(ENABLE_LINK)
         gba/gbaLink.h
     )
 
-    target_include_directories(vbam-core
-        PRIVATE ${SFML_INCLUDE_DIR}
-    )
+    target_include_directories(vbam-core PRIVATE ${SFML_INCLUDE_DIR} ${SFML_INCLUDE_DIR}/SFML/Network ${SFML_INCLUDE_DIR}/SFML/System)
 
     target_link_libraries(vbam-core
         PRIVATE ${SFML_LIBRARIES}

src/core/apu/Blip_Buffer.cpp

@@ -445,7 +445,9 @@ void Blip_Buffer::mix_samples( blip_sample_t const* in, long count )
 	*out -= prev;
 }
 
+#if 0
 blip_ulong const subsample_mask = (1L << BLIP_BUFFER_ACCURACY) - 1;
+#endif
 
 void Blip_Buffer::save_state( blip_buffer_state_t* out )
 {

src/core/apu/Blip_Buffer.h

@@ -553,9 +553,9 @@ inline void Blip_Synth<quality, range>::offset_resampled(blip_resampled_time_t t
 
         blip_long i0 = *imp;
         BLIP_FWD(0)
-        if (quality > 8)
+        if constexpr (quality > 8)
                 BLIP_FWD(2)
-        if (quality > 12)
+        if constexpr (quality > 12)
                 BLIP_FWD(4)
                 {
                         blip_long t0 = i0 * delta + buf[fwd + mid - 1];
@@ -565,9 +565,9 @@ inline void Blip_Synth<quality, range>::offset_resampled(blip_resampled_time_t t
                         buf[fwd + mid - 1] = t0;
                         buf[fwd + mid] = t1;
                 }
-        if (quality > 12)
+        if constexpr (quality > 12)
                 BLIP_REV(6)
-        if (quality > 8)
+        if constexpr (quality > 8)
                 BLIP_REV(4)
         BLIP_REV(2)
 

src/core/apu/Effects_Buffer.cpp

@@ -103,7 +103,7 @@ blargg_err_t Effects_Buffer::set_channel_count( int count, int const* types )
 	for ( auto& buf : bufs )
 		RETURN_ERR( buf.set_sample_rate( sample_rate(), length() ) );
 
-	for ( int i = chans.size(); --i >= 0; )
+	for ( int i = (int)chans.size(); --i >= 0; )
 	{
 		chan_t& ch = chans [i];
 		ch.cfg.vol      = 1.0f;
@@ -266,7 +266,7 @@ void Effects_Buffer::apply_config()
 	}
 
 	// convert volumes
-	for ( i = chans.size(); --i >= 0; )
+	for ( i = (int)chans.size(); --i >= 0; )
 	{
 		chan_t& ch = chans [i];
 		ch.vol [0] = TO_FIXED( ch.cfg.vol - ch.cfg.vol * ch.cfg.pan );
@@ -278,7 +278,7 @@ void Effects_Buffer::apply_config()
 	assign_buffers();
 
 	// set side channels
-	for ( i = chans.size(); --i >= 0; )
+	for ( i = (int)chans.size(); --i >= 0; )
 	{
 		chan_t& ch = chans [i];
 		ch.channel.left  = chans [ch.cfg.echo*2  ].channel.center;
@@ -290,7 +290,7 @@ void Effects_Buffer::apply_config()
 	// determine whether effects and echo are needed at all
 	no_effects = true;
 	no_echo    = true;
-	for ( i = chans.size(); --i >= extra_chans; )
+	for ( i = (int)chans.size(); --i >= extra_chans; )
 	{
 		chan_t& ch = chans [i];
 		if ( ch.cfg.echo && s.feedback )
@@ -313,7 +313,7 @@ void Effects_Buffer::apply_config()
 
 	if ( no_effects )
 	{
-		for ( i = chans.size(); --i >= 0; )
+		for ( i = (int)chans.size(); --i >= 0; )
 		{
 			chan_t& ch = chans [i];
 			ch.channel.center = &bufs [2];
@@ -343,8 +343,8 @@ void Effects_Buffer::assign_buffers()
 		int x = i;
 		if ( i > 1 )
 			x += 2;
-		if ( x >= (int) chans.size() )
-			x -= (chans.size() - 2);
+		if ( x >= (int)chans.size() )
+			x -= (int)(chans.size() - 2);
 		chan_t& ch = chans [x];
 
 		int b = 0;
@@ -488,7 +488,7 @@ void Effects_Buffer::mix_effects( blip_sample_t* out_, int pair_count )
 		// mix any modified buffers
 		{
 			buf_t* buf = bufs.data();
-			int bufs_remain = bufs.size();
+			int bufs_remain = (int)bufs.size();
 			do
 			{
 				if ( buf->non_silent() && ( buf->echo == !!echo_phase ) )
@@ -513,11 +513,11 @@ void Effects_Buffer::mix_effects( blip_sample_t* out_, int pair_count )
 						int offset = -count;
 						do
 						{
-							fixed_t s = BLIP_READER_READ( in );
+							fixed_t _s = BLIP_READER_READ( in );
 							BLIP_READER_NEXT_IDX_( in, bass, offset );
 
-							out [offset] [0] += s * vol_0;
-							out [offset] [1] += s * vol_1;
+							out [offset] [0] += _s * vol_0;
+							out [offset] [1] += _s * vol_1;
 						}
 						while ( ++offset );
 

src/core/apu/Multi_Buffer.h

@@ -228,7 +228,10 @@ class Stereo_Buffer : public Multi_Buffer
         buf_t bufs[bufs_size];
         Stereo_Mixer mixer;
         channel_t chan;
+    
+#if 0
         long samples_avail_;
+#endif
 };
 
 // Silent_Buffer generates no samples, useful where no sound is wanted

src/core/base/CMakeLists.txt

@@ -57,7 +57,7 @@ target_include_directories(vbam-core-base
 )
 
 target_link_libraries(vbam-core-base
-    PRIVATE vbam-fex stb-image
+    PRIVATE vbam-fex stb-image nonstd-lib
     PUBLIC ${ZLIB_LIBRARY}
 )
 

src/core/base/file_util.h

@@ -26,6 +26,7 @@ uint8_t *utilLoad(const char *, bool (*)(const char *), uint8_t *, int &);
 IMAGE_TYPE utilFindType(const char *);
 bool utilIsGBAImage(const char *);
 bool utilIsGBImage(const char *);
+bool utilIsTARAchive(const char *);
 
 #if defined(__LIBRETRO__)
 
@@ -40,7 +41,7 @@ void utilReadDataMem(const uint8_t *&data, variable_desc *);
 #else  // !defined(__LIBRETRO__)
 
 // strip .gz or .z off end
-void utilStripDoubleExtension(const char *, char *);
+void utilStripDoubleExtension(const char *, char *, size_t);
 
 gzFile utilAutoGzOpen(const char *file, const char *mode);
 gzFile utilGzOpen(const char *file, const char *mode);
@@ -58,4 +59,4 @@ void utilWriteInt(gzFile, int);
 
 #endif  // defined(__LIBRETRO__)
 
-#endif  // VBAM_CORE_BASE_FILE_UTIL_H_
+#endif  // VBAM_CORE_BASE_FILE_UTIL_H_

src/core/base/file_util_common.cpp

@@ -19,26 +19,41 @@ FILE* utilOpenFile(const char* filename, const char* mode) {
 #ifdef _WIN32
     std::wstring wfilename = core::internal::ToUTF16(filename);
     if (wfilename.empty()) {
-        return nullptr;
+        return NULL;
     }
 
     std::wstring wmode = core::internal::ToUTF16(mode);
     if (wmode.empty()) {
-        return nullptr;
+        return NULL;
     }
 
+#if __STDC_WANT_SECURE_LIB__
+    FILE *ret = NULL;
+    _wfopen_s(&ret, wfilename.data(), wmode.data());
+    return ret;
+#else
     return _wfopen(wfilename.data(), wmode.data());
+#endif
 #else
     return fopen(filename, mode);
 #endif  // _WIN32
 }
 
+bool utilIsTARAchive(const char* file) {
+    const char* p = strrchr(file, '.');
+    
+    if ((strcasecmp(p, ".tar") == 0))
+        return true;
+
+    return false;
+}
+
 bool utilIsGBAImage(const char* file) {
     coreOptions.cpuIsMultiBoot = false;
     if (strlen(file) > 4) {
         const char* p = strrchr(file, '.');
 
-        if (p != nullptr) {
+        if (p != NULL) {
             if ((strcasecmp(p, ".agb") == 0) || (strcasecmp(p, ".gba") == 0) ||
                 (strcasecmp(p, ".bin") == 0) || (strcasecmp(p, ".elf") == 0))
                 return true;
@@ -56,7 +71,7 @@ bool utilIsGBImage(const char* file) {
     if (strlen(file) > 4) {
         const char* p = strrchr(file, '.');
 
-        if (p != nullptr) {
+        if (p != NULL) {
             if ((strcasecmp(p, ".dmg") == 0) || (strcasecmp(p, ".gb") == 0) ||
                 (strcasecmp(p, ".gbc") == 0) || (strcasecmp(p, ".cgb") == 0) ||
                 (strcasecmp(p, ".sgb") == 0))

src/core/base/file_util_desktop.cpp

@@ -24,7 +24,7 @@ bool utilIsGzipFile(const char* file) {
     if (strlen(file) > 3) {
         const char* p = strrchr(file, '.');
 
-        if (p != nullptr) {
+        if (p != NULL) {
             if (strcasecmp(p, ".gz") == 0)
                 return true;
             if (strcasecmp(p, ".z") == 0)
@@ -36,22 +36,27 @@ bool utilIsGzipFile(const char* file) {
 }
 
 // Opens and scans archive using accept(). Returns fex_t if found.
-// If error or not found, displays message and returns nullptr.
+// If error or not found, displays message and returns NULL.
 fex_t* scanArchive(const char* file, bool (*accept)(const char*), char (&buffer)[2048]) {
     fex_t* fe;
     fex_err_t err = fex_open(&fe, file);
     if (!fe) {
         systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s: %s"), file, err);
-        return nullptr;
+        return NULL;
     }
 
     // Scan filenames
     bool found = false;
     while (!fex_done(fe)) {
+#ifdef __STDC_WANT_SECURE_LIB__
+        strncpy_s(buffer, sizeof buffer, fex_name(fe), sizeof buffer);
+#else
         strncpy(buffer, fex_name(fe), sizeof buffer);
+#endif
+
         buffer[sizeof buffer - 1] = '\0';
 
-        utilStripDoubleExtension(buffer, buffer);
+        utilStripDoubleExtension(buffer, buffer, sizeof buffer);
 
         if (accept(buffer)) {
             found = true;
@@ -62,14 +67,14 @@ fex_t* scanArchive(const char* file, bool (*accept)(const char*), char (&buffer)
         if (err) {
             systemMessage(MSG_BAD_ZIP_FILE, N_("Cannot read archive %s: %s"), file, err);
             fex_close(fe);
-            return nullptr;
+            return NULL;
         }
     }
 
     if (!found) {
         systemMessage(MSG_NO_IMAGE_ON_ZIP, N_("No image found in file %s"), file);
         fex_close(fe);
-        return nullptr;
+        return NULL;
     }
     return fe;
 }
@@ -96,10 +101,10 @@ IMAGE_TYPE utilFindType(const char* file, char (&buffer)[2048]) {
     return utilIsGBAImage(file) ? IMAGE_GBA : IMAGE_GB;
 }
 
-int(ZEXPORT* utilGzWriteFunc)(gzFile, const voidp, unsigned int) = nullptr;
-int(ZEXPORT* utilGzReadFunc)(gzFile, voidp, unsigned int) = nullptr;
-int(ZEXPORT* utilGzCloseFunc)(gzFile) = nullptr;
-z_off_t(ZEXPORT* utilGzSeekFunc)(gzFile, z_off_t, int) = nullptr;
+int(ZEXPORT* utilGzWriteFunc)(gzFile, const voidp, unsigned int) = NULL;
+int(ZEXPORT* utilGzReadFunc)(gzFile, voidp, unsigned int) = NULL;
+int(ZEXPORT* utilGzCloseFunc)(gzFile) = NULL;
+z_off_t(ZEXPORT* utilGzSeekFunc)(gzFile, z_off_t, int) = NULL;
 
 }  // namespace
 
@@ -108,7 +113,7 @@ uint8_t* utilLoad(const char* file, bool (*accept)(const char*), uint8_t* data,
     char buffer[2048];
     fex_t* fe = scanArchive(file, accept, buffer);
     if (!fe)
-        return nullptr;
+        return NULL;
 
     // Allocate space for image
     fex_err_t err = fex_stat(fe);
@@ -117,17 +122,17 @@ uint8_t* utilLoad(const char* file, bool (*accept)(const char*), uint8_t* data,
         size = fileSize;
 
     if (size > MAX_CART_SIZE)
-        return nullptr;
+        return NULL;
 
     uint8_t* image = data;
 
-    if (image == nullptr) {
+    if (image == NULL) {
         // allocate buffer memory if none was passed to the function
         image = (uint8_t*)malloc(utilGetSize(size));
-        if (image == nullptr) {
+        if (image == NULL) {
             fex_close(fe);
             systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"), "data");
-            return nullptr;
+            return NULL;
         }
         size = fileSize;
     }
@@ -136,11 +141,12 @@ uint8_t* utilLoad(const char* file, bool (*accept)(const char*), uint8_t* data,
     int read = fileSize <= size ? fileSize : size;  // do not read beyond file
     err = fex_read(fe, image, read);
     fex_close(fe);
+
     if (err) {
         systemMessage(MSG_ERROR_READING_IMAGE, N_("Error reading image from %s: %s"), buffer, err);
-        if (data == nullptr)
+        if (data == NULL)
             free(image);
-        return nullptr;
+        return NULL;
     }
 
     size = fileSize;
@@ -153,9 +159,16 @@ IMAGE_TYPE utilFindType(const char* file) {
     return utilFindType(file, buffer);
 }
 
-void utilStripDoubleExtension(const char* file, char* buffer) {
+void utilStripDoubleExtension(const char* file, char* buffer, size_t len) {
+#if !__STDC_WANT_SECURE_LIB__
+    (void)len;
+#endif
     if (buffer != file)  // allows conversion in place
+#if __STDC_WANT_SECURE_LIB__
+        strcpy_s(buffer, len, file);
+#else
         strcpy(buffer, file);
+#endif
 
     if (utilIsGzipFile(file)) {
         char* p = strrchr(buffer, '.');
@@ -170,7 +183,7 @@ gzFile utilAutoGzOpen(const char* file, const char* mode) {
 
     std::wstring wfile = core::internal::ToUTF16(file);
     if (wfile.empty()) {
-        return nullptr;
+        return NULL;
     }
 
     return gzopen_w(wfile.data(), mode);

src/core/base/file_util_libretro.cpp

@@ -25,12 +25,12 @@ static int utilGetSize(int size) {
 }
 
 uint8_t* utilLoad(const char* file, bool (*)(const char*), uint8_t* data, int& size) {
-    FILE* fp = nullptr;
+    FILE* fp = NULL;
 
     fp = fopen(file, "rb");
     if (!fp) {
         log("Failed to open file %s", file);
-        return nullptr;
+        return NULL;
     }
     fseek(fp, 0, SEEK_END);  // go to end
 
@@ -38,18 +38,18 @@ uint8_t* utilLoad(const char* file, bool (*)(const char*), uint8_t* data, int& s
     rewind(fp);
 
     uint8_t* image = data;
-    if (image == nullptr) {
+    if (image == NULL) {
         image = (uint8_t*)malloc(utilGetSize(size));
-        if (image == nullptr) {
+        if (image == NULL) {
             log("Failed to allocate memory for %s", file);
-            return nullptr;
+            return NULL;
         }
     }
 
     if (fread(image, 1, size, fp) != (size_t)size) {
         log("Failed to read from %s", file);
         fclose(fp);
-        return nullptr;
+        return NULL;
     }
 
     fclose(fp);

src/core/base/image_util.cpp

@@ -20,6 +20,25 @@ bool utilWritePNGFile(const char* fileName, int w, int h, uint8_t* pix) {
     int sizeY = h;
 
     switch (systemColorDepth) {
+        case 8: {
+            uint8_t* pixU8 = (uint8_t*)pix + (w + 4);
+            for (int y = 0; y < sizeY; y++) {
+                for (int x = 0; x < sizeX; x++, pixU8++) {
+                    // White color fix
+                    if (*pixU8 == 0xff) {
+                        *b++ = 0xff;
+                        *b++ = 0xff;
+                        *b++ = 0xff;
+                    } else {
+                        *b++ = (((*pixU8 >> 5) & 0x7) << 5);
+                        *b++ = (((*pixU8 >> 2) & 0x7) << 5);
+                        *b++ = ((*pixU8 & 0x3) << 6);
+                    }
+                }
+
+                pixU8 += 4;
+            }
+        } break;
         case 16: {
             uint16_t* p = (uint16_t*)(pix + (w + 2) * 2);  // skip first black line
             for (int y = 0; y < sizeY; y++) {
@@ -77,7 +96,12 @@ bool utilWritePNGFile(const char* fileName, int w, int h, uint8_t* pix) {
 bool utilWriteBMPFile(const char* fileName, int w, int h, uint8_t* pix) {
     uint8_t writeBuffer[512 * 3];
 
+#if __STDC_WANT_SECURE_LIB__
+    FILE* fp = NULL;
+    fopen_s(&fp, fileName, "wb");
+#else
     FILE* fp = fopen(fileName, "wb");
+#endif
 
     if (!fp) {
         systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), fileName);
@@ -125,6 +149,34 @@ bool utilWriteBMPFile(const char* fileName, int w, int h, uint8_t* pix) {
     int sizeY = h;
 
     switch (systemColorDepth) {
+        case 8: {
+            uint8_t* pixU8 = 0;
+            pixU8 = (uint8_t*)pix + ((w + 4) * (h));
+
+            for (int y = 0; y < sizeY; y++) {
+                for (int x = 0; x < sizeX; x++, pixU8++) {
+                    // White color fix
+                    if (*pixU8 == 0xff) {
+                        *b++ = 0xff;
+                        *b++ = 0xff;
+                        *b++ = 0xff;
+                    } else {
+                        *b++ = ((*pixU8 & 0x3) << 6);
+                        *b++ = (((*pixU8 >> 2) & 0x7) << 5);
+                        *b++ = (((*pixU8 >> 5) & 0x7) << 5);
+                    }
+                }
+
+                pixU8++;
+                pixU8++;
+                pixU8++;
+                pixU8++;
+                pixU8 -= 2 * (w + 4);
+
+                fwrite(writeBuffer, 1, 3 * w, fp);
+                b = writeBuffer;
+            }
+        } break;
         case 16: {
             uint16_t* p = (uint16_t*)(pix + (w + 2) * (h) * 2);  // skip first black line
             for (int y = 0; y < sizeY; y++) {

src/core/base/image_util.h

@@ -10,4 +10,6 @@
 bool utilWritePNGFile(const char*, int, int, uint8_t*);
 bool utilWriteBMPFile(const char*, int, int, uint8_t*);
 
-#endif  // VBAM_CORE_BASE_IMAGE_UTIL_H_
+extern bool no_border;
+
+#endif  // VBAM_CORE_BASE_IMAGE_UTIL_H_

src/core/base/internal/file_util_internal.cpp

@@ -10,13 +10,13 @@ namespace internal {
 #if defined(_WIN32)
 
 std::wstring ToUTF16(const char* utf8) {
-    int len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, nullptr, 0);
+    int len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0);
     if (len == 0) {
         return std::wstring();
     }
 
     std::wstring result(len, 0);
-    MultiByteToWideChar(CP_UTF8, 0, utf8, -1, result.data(), len);
+    MultiByteToWideChar(CP_UTF8, 0, utf8, -1, (LPWSTR)result.data(), len);
     return result;
 }
 

src/core/base/internal/memgzio.c

@@ -20,6 +20,10 @@
 
 #include "core/base/internal/memgzio.h"
 
+#if __STDC_WANT_SECURE_LIB__
+#define vsnprintf vsprintf_s
+#endif
+
 #ifndef local
 #define local static
 #endif
@@ -213,7 +217,7 @@ local int memPrintf(MEMFILE *f, const char *format, ...)
         int len;
 
         va_start(list, format);
-        len = vsprintf(buffer, format, list);
+        len = vsnprintf(buffer, sizeof(buffer), format, list);
         va_end(list);
 
         return (int)memWrite(buffer, 1, len, f);

src/core/base/patch.cpp

@@ -285,8 +285,8 @@ static bool patchApplyUPS(const char* patchname, uint8_t** rom, int* size)
         return false;
     }
     if (dataSize > *size) {
-        *rom = (uint8_t*)realloc(*rom, dataSize);
-        memset(*rom + *size, 0, dataSize - *size);
+        *rom = (uint8_t*)realloc(*rom, (size_t)dataSize);
+        memset(*rom + *size, 0, (size_t)(dataSize - *size));
         *size = (int)(dataSize);
     }
 

src/core/base/system.h

@@ -74,8 +74,8 @@ extern struct CoreOptions {
     uint32_t speedup_throttle = 100;
     uint32_t speedup_frame_skip = 9;
     uint32_t throttle = 100;
-    const char* loadDotCodeFile = nullptr;
-    const char* saveDotCodeFile = nullptr;
+    const char* loadDotCodeFile = NULL;
+    const char* saveDotCodeFile = NULL;
 } coreOptions;
 
 // The following functions must be implemented by the emulator.
@@ -110,6 +110,7 @@ extern void systemFrame();
 extern void systemGbBorderOn();
 extern void (*dbgOutput)(const char* s, uint32_t addr);
 extern void (*dbgSignal)(int sig, int number);
+extern uint8_t  systemColorMap8[0x10000];
 extern uint16_t systemColorMap16[0x10000];
 extern uint32_t systemColorMap32[0x10000];
 extern uint16_t systemGbPalette[24];

src/core/base/test/CMakeLists.txt

@@ -9,4 +9,5 @@ add_library(vbam-core-base-test
     notreached.h)
 
 target_link_libraries(vbam-core-base-test
-    INTERFACE GTest::gtest)
+    INTERFACE GTest::gtest nonstd-lib
+)

src/core/fex/7z_C/7z.h

@@ -1,200 +1,204 @@
-/* 7z.h -- 7z interface
-2010-03-11 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_H
-#define __7Z_H
-
-#include "7zBuf.h"
-
-EXTERN_C_BEGIN
-
-#define k7zStartHeaderSize 0x20
-#define k7zSignatureSize 6
-extern Byte k7zSignature[k7zSignatureSize];
-#define k7zMajorVersion 0
-
-enum EIdEnum {
-    k7zIdEnd,
-    k7zIdHeader,
-    k7zIdArchiveProperties,
-    k7zIdAdditionalStreamsInfo,
-    k7zIdMainStreamsInfo,
-    k7zIdFilesInfo,
-    k7zIdPackInfo,
-    k7zIdUnpackInfo,
-    k7zIdSubStreamsInfo,
-    k7zIdSize,
-    k7zIdCRC,
-    k7zIdFolder,
-    k7zIdCodersUnpackSize,
-    k7zIdNumUnpackStream,
-    k7zIdEmptyStream,
-    k7zIdEmptyFile,
-    k7zIdAnti,
-    k7zIdName,
-    k7zIdCTime,
-    k7zIdATime,
-    k7zIdMTime,
-    k7zIdWinAttributes,
-    k7zIdComment,
-    k7zIdEncodedHeader,
-    k7zIdStartPos,
-    k7zIdDummy
-};
-
-typedef struct
-{
-    UInt32 NumInStreams;
-    UInt32 NumOutStreams;
-    UInt64 MethodID;
-    CBuf Props;
-} CSzCoderInfo;
-
-void SzCoderInfo_Init(CSzCoderInfo* p);
-void SzCoderInfo_Free(CSzCoderInfo* p, ISzAlloc* alloc);
-
-typedef struct
-{
-    UInt32 InIndex;
-    UInt32 OutIndex;
-} CSzBindPair;
-
-typedef struct
-{
-    CSzCoderInfo* Coders;
-    CSzBindPair* BindPairs;
-    UInt32* PackStreams;
-    UInt64* UnpackSizes;
-    UInt32 NumCoders;
-    UInt32 NumBindPairs;
-    UInt32 NumPackStreams;
-    int UnpackCRCDefined;
-    UInt32 UnpackCRC;
-
-    UInt32 NumUnpackStreams;
-} CSzFolder;
-
-void SzFolder_Init(CSzFolder* p);
-UInt64 SzFolder_GetUnpackSize(CSzFolder* p);
-int SzFolder_FindBindPairForInStream(CSzFolder* p, UInt32 inStreamIndex);
-UInt32 SzFolder_GetNumOutStreams(CSzFolder* p);
-UInt64 SzFolder_GetUnpackSize(CSzFolder* p);
-
-SRes SzFolder_Decode(const CSzFolder* folder, const UInt64* packSizes,
-    ILookInStream* stream, UInt64 startPos,
-    Byte* outBuffer, size_t outSize, ISzAlloc* allocMain);
-
-typedef struct
-{
-    UInt32 Low;
-    UInt32 High;
-} CNtfsFileTime;
-
-typedef struct
-{
-    CNtfsFileTime MTime;
-    UInt64 Size;
-    UInt32 Crc;
-    UInt32 Attrib;
-    Byte HasStream;
-    Byte IsDir;
-    Byte IsAnti;
-    Byte CrcDefined;
-    Byte MTimeDefined;
-    Byte AttribDefined;
-} CSzFileItem;
-
-void SzFile_Init(CSzFileItem* p);
-
-typedef struct
-{
-    UInt64* PackSizes;
-    Byte* PackCRCsDefined;
-    UInt32* PackCRCs;
-    CSzFolder* Folders;
-    CSzFileItem* Files;
-    UInt32 NumPackStreams;
-    UInt32 NumFolders;
-    UInt32 NumFiles;
-} CSzAr;
-
-void SzAr_Init(CSzAr* p);
-void SzAr_Free(CSzAr* p, ISzAlloc* alloc);
-
-/*
-  SzExtract extracts file from archive
-
-  *outBuffer must be 0 before first call for each new archive.
-
-  Extracting cache:
-    If you need to decompress more than one file, you can send
-    these values from previous call:
-      *blockIndex,
-      *outBuffer,
-      *outBufferSize
-    You can consider "*outBuffer" as cache of solid block. If your archive is solid,
-    it will increase decompression speed.
-  
-    If you use external function, you can declare these 3 cache variables
-    (blockIndex, outBuffer, outBufferSize) as static in that external function.
-    
-    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
-*/
-
-typedef struct
-{
-    CSzAr db;
-
-    UInt64 startPosAfterHeader;
-    UInt64 dataPos;
-
-    UInt32* FolderStartPackStreamIndex;
-    UInt64* PackStreamStartPositions;
-    UInt32* FolderStartFileIndex;
-    UInt32* FileIndexToFolderIndexMap;
-
-    size_t* FileNameOffsets; /* in 2-byte steps */
-    CBuf FileNames; /* UTF-16-LE */
-} CSzArEx;
-
-void SzArEx_Init(CSzArEx* p);
-void SzArEx_Free(CSzArEx* p, ISzAlloc* alloc);
-UInt64 SzArEx_GetFolderStreamPos(const CSzArEx* p, UInt32 folderIndex, UInt32 indexInFolder);
-int SzArEx_GetFolderFullPackSize(const CSzArEx* p, UInt32 folderIndex, UInt64* resSize);
-
-/*
-if dest == NULL, the return value specifies the required size of the buffer,
-  in 16-bit characters, including the null-terminating character.
-if dest != NULL, the return value specifies the number of 16-bit characters that
-  are written to the dest, including the null-terminating character. */
-
-size_t SzArEx_GetFileNameUtf16(const CSzArEx* p, size_t fileIndex, UInt16* dest);
-
-SRes SzArEx_Extract(
-    const CSzArEx* db,
-    ILookInStream* inStream,
-    UInt32 fileIndex, /* index of file */
-    UInt32* blockIndex, /* index of solid block */
-    Byte** outBuffer, /* pointer to pointer to output buffer (allocated with allocMain) */
-    size_t* outBufferSize, /* buffer size for output buffer */
-    size_t* offset, /* offset of stream for required file in *outBuffer */
-    size_t* outSizeProcessed, /* size of file in *outBuffer */
-    ISzAlloc* allocMain,
-    ISzAlloc* allocTemp);
-
-/*
-SzArEx_Open Errors:
-SZ_ERROR_NO_ARCHIVE
-SZ_ERROR_ARCHIVE
-SZ_ERROR_UNSUPPORTED
-SZ_ERROR_MEM
-SZ_ERROR_CRC
-SZ_ERROR_INPUT_EOF
-SZ_ERROR_FAIL
-*/
-
-SRes SzArEx_Open(CSzArEx* p, ILookInStream* inStream, ISzAlloc* allocMain, ISzAlloc* allocTemp);
-
-EXTERN_C_END
-
-#endif
+/* 7z.h -- 7z interface
+2023-04-02 : Igor Pavlov : Public domain */
+
+#ifndef ZIP7_INC_7Z_H
+#define ZIP7_INC_7Z_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+#define k7zStartHeaderSize 0x20
+#define k7zSignatureSize 6
+
+extern const Byte k7zSignature[k7zSignatureSize];
+
+typedef struct
+{
+  const Byte *Data;
+  size_t Size;
+} CSzData;
+
+/* CSzCoderInfo & CSzFolder support only default methods */
+
+typedef struct
+{
+  size_t PropsOffset;
+  UInt32 MethodID;
+  Byte NumStreams;
+  Byte PropsSize;
+} CSzCoderInfo;
+
+typedef struct
+{
+  UInt32 InIndex;
+  UInt32 OutIndex;
+} CSzBond;
+
+#define SZ_NUM_CODERS_IN_FOLDER_MAX 4
+#define SZ_NUM_BONDS_IN_FOLDER_MAX 3
+#define SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX 4
+
+typedef struct
+{
+  UInt32 NumCoders;
+  UInt32 NumBonds;
+  UInt32 NumPackStreams;
+  UInt32 UnpackStream;
+  UInt32 PackStreams[SZ_NUM_PACK_STREAMS_IN_FOLDER_MAX];
+  CSzBond Bonds[SZ_NUM_BONDS_IN_FOLDER_MAX];
+  CSzCoderInfo Coders[SZ_NUM_CODERS_IN_FOLDER_MAX];
+} CSzFolder;
+
+
+SRes SzGetNextFolderItem(CSzFolder *f, CSzData *sd);
+
+typedef struct
+{
+  UInt32 Low;
+  UInt32 High;
+} CNtfsFileTime;
+
+typedef struct
+{
+  Byte *Defs; /* MSB 0 bit numbering */
+  UInt32 *Vals;
+} CSzBitUi32s;
+
+typedef struct
+{
+  Byte *Defs; /* MSB 0 bit numbering */
+  // UInt64 *Vals;
+  CNtfsFileTime *Vals;
+} CSzBitUi64s;
+
+#define SzBitArray_Check(p, i) (((p)[(i) >> 3] & (0x80 >> ((i) & 7))) != 0)
+
+#define SzBitWithVals_Check(p, i) ((p)->Defs && ((p)->Defs[(i) >> 3] & (0x80 >> ((i) & 7))) != 0)
+
+typedef struct
+{
+  UInt32 NumPackStreams;
+  UInt32 NumFolders;
+
+  UInt64 *PackPositions;          // NumPackStreams + 1
+  CSzBitUi32s FolderCRCs;         // NumFolders
+
+  size_t *FoCodersOffsets;        // NumFolders + 1
+  UInt32 *FoStartPackStreamIndex; // NumFolders + 1
+  UInt32 *FoToCoderUnpackSizes;   // NumFolders + 1
+  Byte *FoToMainUnpackSizeIndex;  // NumFolders
+  UInt64 *CoderUnpackSizes;       // for all coders in all folders
+
+  Byte *CodersData;
+
+  UInt64 RangeLimit;
+} CSzAr;
+
+UInt64 SzAr_GetFolderUnpackSize(const CSzAr *p, UInt32 folderIndex);
+
+SRes SzAr_DecodeFolder(const CSzAr *p, UInt32 folderIndex,
+    ILookInStreamPtr stream, UInt64 startPos,
+    Byte *outBuffer, size_t outSize,
+    ISzAllocPtr allocMain);
+
+typedef struct
+{
+  CSzAr db;
+
+  UInt64 startPosAfterHeader;
+  UInt64 dataPos;
+  
+  UInt32 NumFiles;
+
+  UInt64 *UnpackPositions;  // NumFiles + 1
+  // Byte *IsEmptyFiles;
+  Byte *IsDirs;
+  CSzBitUi32s CRCs;
+
+  CSzBitUi32s Attribs;
+  // CSzBitUi32s Parents;
+  CSzBitUi64s MTime;
+  CSzBitUi64s CTime;
+
+  UInt32 *FolderToFile;   // NumFolders + 1
+  UInt32 *FileToFolder;   // NumFiles
+
+  size_t *FileNameOffsets; /* in 2-byte steps */
+  Byte *FileNames;  /* UTF-16-LE */
+} CSzArEx;
+
+#define SzArEx_IsDir(p, i) (SzBitArray_Check((p)->IsDirs, i))
+
+#define SzArEx_GetFileSize(p, i) ((p)->UnpackPositions[(i) + 1] - (p)->UnpackPositions[i])
+
+void SzArEx_Init(CSzArEx *p);
+void SzArEx_Free(CSzArEx *p, ISzAllocPtr alloc);
+UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 indexInFolder);
+int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *resSize);
+
+/*
+if dest == NULL, the return value specifies the required size of the buffer,
+  in 16-bit characters, including the null-terminating character.
+if dest != NULL, the return value specifies the number of 16-bit characters that
+  are written to the dest, including the null-terminating character. */
+
+size_t SzArEx_GetFileNameUtf16(const CSzArEx *p, size_t fileIndex, UInt16 *dest);
+
+/*
+size_t SzArEx_GetFullNameLen(const CSzArEx *p, size_t fileIndex);
+UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 *dest);
+*/
+
+
+
+/*
+  SzArEx_Extract extracts file from archive
+
+  *outBuffer must be 0 before first call for each new archive.
+
+  Extracting cache:
+    If you need to decompress more than one file, you can send
+    these values from previous call:
+      *blockIndex,
+      *outBuffer,
+      *outBufferSize
+    You can consider "*outBuffer" as cache of solid block. If your archive is solid,
+    it will increase decompression speed.
+  
+    If you use external function, you can declare these 3 cache variables
+    (blockIndex, outBuffer, outBufferSize) as static in that external function.
+    
+    Free *outBuffer and set *outBuffer to 0, if you want to flush cache.
+*/
+
+SRes SzArEx_Extract(
+    const CSzArEx *db,
+    ILookInStreamPtr inStream,
+    UInt32 fileIndex,         /* index of file */
+    UInt32 *blockIndex,       /* index of solid block */
+    Byte **outBuffer,         /* pointer to pointer to output buffer (allocated with allocMain) */
+    size_t *outBufferSize,    /* buffer size for output buffer */
+    size_t *offset,           /* offset of stream for required file in *outBuffer */
+    size_t *outSizeProcessed, /* size of file in *outBuffer */
+    ISzAllocPtr allocMain,
+    ISzAllocPtr allocTemp);
+
+
+/*
+SzArEx_Open Errors:
+SZ_ERROR_NO_ARCHIVE
+SZ_ERROR_ARCHIVE
+SZ_ERROR_UNSUPPORTED
+SZ_ERROR_MEM
+SZ_ERROR_CRC
+SZ_ERROR_INPUT_EOF
+SZ_ERROR_FAIL
+*/
+
+SRes SzArEx_Open(CSzArEx *p, ILookInStreamPtr inStream,
+    ISzAllocPtr allocMain, ISzAllocPtr allocTemp);
+
+EXTERN_C_END
+
+#endif

src/core/fex/7z_C/7zAlloc.c

@@ -1,74 +1,89 @@
-/* 7zAlloc.c -- Allocation functions
-2010-10-29 : Igor Pavlov : Public domain */
-
-#include "7zAlloc.h"
-
-/* #define _SZ_ALLOC_DEBUG */
-/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
-
-#ifdef _SZ_ALLOC_DEBUG
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <stdio.h>
-int g_allocCount = 0;
-int g_allocCountTemp = 0;
-
-#endif
-
-void* SzAlloc(void* p, size_t size)
-{
-    (void)p; // unused param
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
-    g_allocCount++;
-#endif
-    return malloc(size);
-}
-
-void SzFree(void* p, void* address)
-{
-    (void)p; // unused param
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0) {
-        g_allocCount--;
-        fprintf(stderr, "\nFree; count = %10d", g_allocCount);
-    }
-#endif
-    free(address);
-}
-
-void* SzAllocTemp(void* p, size_t size)
-{
-    (void)p; // unused param
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);
-    g_allocCountTemp++;
-#ifdef _WIN32
-    return HeapAlloc(GetProcessHeap(), 0, size);
-#endif
-#endif
-    return malloc(size);
-}
-
-void SzFreeTemp(void* p, void* address)
-{
-    (void)p; // unused param
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0) {
-        g_allocCountTemp--;
-        fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
-    }
-#ifdef _WIN32
-    HeapFree(GetProcessHeap(), 0, address);
-    return;
-#endif
-#endif
-    free(address);
-}
+/* 7zAlloc.c -- Allocation functions for 7z processing
+2023-03-04 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include <stdlib.h>
+
+#include "7zAlloc.h"
+
+/* #define SZ_ALLOC_DEBUG */
+/* use SZ_ALLOC_DEBUG to debug alloc/free operations */
+
+#ifdef SZ_ALLOC_DEBUG
+
+/*
+#ifdef _WIN32
+#include "7zWindows.h"
+#endif
+*/
+
+#include <stdio.h>
+static int g_allocCount = 0;
+static int g_allocCountTemp = 0;
+
+static void Print_Alloc(const char *s, size_t size, int *counter)
+{
+  const unsigned size2 = (unsigned)size;
+  fprintf(stderr, "\n%s count = %10d : %10u bytes; ", s, *counter, size2);
+  (*counter)++;
+}
+static void Print_Free(const char *s, int *counter)
+{
+  (*counter)--;
+  fprintf(stderr, "\n%s count = %10d", s, *counter);
+}
+#endif
+
+void *SzAlloc(ISzAllocPtr p, size_t size)
+{
+  UNUSED_VAR(p)
+  if (size == 0)
+    return 0;
+  #ifdef SZ_ALLOC_DEBUG
+  Print_Alloc("Alloc", size, &g_allocCount);
+  #endif
+  return malloc(size);
+}
+
+void SzFree(ISzAllocPtr p, void *address)
+{
+  UNUSED_VAR(p)
+  #ifdef SZ_ALLOC_DEBUG
+  if (address)
+    Print_Free("Free ", &g_allocCount);
+  #endif
+  free(address);
+}
+
+void *SzAllocTemp(ISzAllocPtr p, size_t size)
+{
+  UNUSED_VAR(p)
+  if (size == 0)
+    return 0;
+  #ifdef SZ_ALLOC_DEBUG
+  Print_Alloc("Alloc_temp", size, &g_allocCountTemp);
+  /*
+  #ifdef _WIN32
+  return HeapAlloc(GetProcessHeap(), 0, size);
+  #endif
+  */
+  #endif
+  return malloc(size);
+}
+
+void SzFreeTemp(ISzAllocPtr p, void *address)
+{
+  UNUSED_VAR(p)
+  #ifdef SZ_ALLOC_DEBUG
+  if (address)
+    Print_Free("Free_temp ", &g_allocCountTemp);
+  /*
+  #ifdef _WIN32
+  HeapFree(GetProcessHeap(), 0, address);
+  return;
+  #endif
+  */
+  #endif
+  free(address);
+}

src/core/fex/7z_C/7zAlloc.h

@@ -1,15 +1,19 @@
-/* 7zAlloc.h -- Allocation functions
-2010-10-29 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_ALLOC_H
-#define __7Z_ALLOC_H
-
-#include <stdlib.h>
-
-void* SzAlloc(void* p, size_t size);
-void SzFree(void* p, void* address);
-
-void* SzAllocTemp(void* p, size_t size);
-void SzFreeTemp(void* p, void* address);
-
-#endif
+/* 7zAlloc.h -- Allocation functions
+2023-03-04 : Igor Pavlov : Public domain */
+
+#ifndef ZIP7_INC_7Z_ALLOC_H
+#define ZIP7_INC_7Z_ALLOC_H
+
+#include "7zTypes.h"
+
+EXTERN_C_BEGIN
+
+void *SzAlloc(ISzAllocPtr p, size_t size);
+void SzFree(ISzAllocPtr p, void *address);
+
+void *SzAllocTemp(ISzAllocPtr p, size_t size);
+void SzFreeTemp(ISzAllocPtr p, void *address);
+
+EXTERN_C_END
+
+#endif

src/core/fex/7z_C/7zBuf.c

@@ -1,34 +1,36 @@
-/* 7zBuf.c -- Byte Buffer
-2008-03-28
-Igor Pavlov
-Public domain */
-
-#include "7zBuf.h"
-
-void Buf_Init(CBuf* p)
-{
-    p->data = 0;
-    p->size = 0;
-}
-
-int Buf_Create(CBuf* p, size_t size, ISzAlloc* alloc)
-{
-    p->size = 0;
-    if (size == 0) {
-        p->data = 0;
-        return 1;
-    }
-    p->data = (Byte*)alloc->Alloc(alloc, size);
-    if (p->data != 0) {
-        p->size = size;
-        return 1;
-    }
-    return 0;
-}
-
-void Buf_Free(CBuf* p, ISzAlloc* alloc)
-{
-    alloc->Free(alloc, p->data);
-    p->data = 0;
-    p->size = 0;
-}
+/* 7zBuf.c -- Byte Buffer
+2017-04-03 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
+
+#include "7zBuf.h"
+
+void Buf_Init(CBuf *p)
+{
+  p->data = 0;
+  p->size = 0;
+}
+
+int Buf_Create(CBuf *p, size_t size, ISzAllocPtr alloc)
+{
+  p->size = 0;
+  if (size == 0)
+  {
+    p->data = 0;
+    return 1;
+  }
+  p->data = (Byte *)ISzAlloc_Alloc(alloc, size);
+  if (p->data)
+  {
+    p->size = size;
+    return 1;
+  }
+  return 0;
+}
+
+void Buf_Free(CBuf *p, ISzAllocPtr alloc)
+{
+  ISzAlloc_Free(alloc, p->data);
+  p->data = 0;
+  p->size = 0;
+}