[Input] Unify UserInput event handling

This adds a custom UserInputEvent for handling joypad and keyboard input for both accelerators and emulator control configuration. These changes fix a number of issues with the wxWidgets implementation of key down / up event handling. In particular, every "down" event now has a corresponding "up" event. All of the special handling that was done in multiple places to handle shortcuts is now done in a new class, `UserInputEventSender`, simplifying multiple call sites. This is another step towards complete unification of UserInput handling, which will prevent double assignment between shortcuts and emulator controls. Bug: #745
2025-10-06 08:02:50 +02:00 · 2024-04-22 18:06:12 -07:00
293 changed files with 46769 additions and 59394 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-github: rkitover
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -11,7 +11,7 @@ body:
  - type: markdown
    attributes:
      value: |
-            Please try the nightly build from: https://nightly.visualboyadvance-m.org and factory resetting the emulator from the Help menu.
+            Please try the nightly build from: https://nightly.vba-m.com and factory resetting the emulator from the Help menu.
            On Linux build master from source or use the edge snap.
            And last but not least, search for existing reports via the filters bar on the issues page.
  - type: markdown
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: VBA-M Forum
-    url: https://board.visualboyadvance-m.org/
+    url: https://board.vba-m.com/
    about: For general questions and support please join our forum or our
  - name: VBA-M IRC Channel
    url: https://web.libera.chat/#vba-m
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -14,7 +14,7 @@ body:
  - type: markdown
    attributes:
      value: |
-            Please try a nightly build from: https://nightly.visualboyadvance-m.org to see if your idea has already been implemented.
+            Please try a nightly build from: https://nightly.vba-m.com to see if your idea has already been implemented.
            On Linux build master from source or use the edge snap.
            And last but not least, search for existing requests via the filters bar on the issues page.
  - type: textarea
--- a/.github/workflows/devkitpro-build.yml
+++ b/.github/workflows/devkitpro-build.yml
@@ -1,33 +0,0 @@
-name: Libretro Devkitpro
-on: [push, pull_request]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        target_name: [ngc, wii, wiiu, switch]
-        build_type: [release, debug]
-        include:
-          - libretro_build: 'DEBUG=0'
-            build_type: release
-          - libretro_build: 'DEBUG=1'
-            build_type: debug
-          - devkit_container: 'devkitpro/devkitppc:latest'
-            target_name: ngc
-          - devkit_container: 'devkitpro/devkitppc:latest'
-            target_name: wii
-          - devkit_container: 'devkitpro/devkitppc:latest'
-            target_name: wiiu
-          - devkit_container: 'devkitpro/devkita64:latest'
-            target_name: switch
-    runs-on: ubuntu-latest
-    container: ${{ matrix.devkit_container }}
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v4
-        with: 
-          submodules: recursive
-
-      # Libretro build
-      - name: Build libretro core
-        run: make -C src/libretro ${{ matrix.libretro_build }} platform=${{ matrix.target_name }}
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -1,4 +1,4 @@
-name: macOS Latest
+name: macOS Latest Build
 on: [push, pull_request]

 jobs:
@@ -55,9 +55,3 @@ jobs:
        name: Build libretro core
        run: >-
          nix-shell --command 'make -C src/libretro ${{ matrix.libretro_build }}'
-
-      # Run tests
-      - if: matrix.build_options == 'default'
-        name: Run tests
-        run: >-
-          nix-shell --command 'cd build && ctest -j --output-on-failure'
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -1,4 +1,4 @@
-name: MSYS2
+name: MSYS2 Build
 on: [push, pull_request]

 jobs:
--- a/.github/workflows/ubuntu-build.yml
+++ b/.github/workflows/ubuntu-build.yml
@@ -1,4 +1,4 @@
-name: Ubuntu Latest
+name: Ubuntu Latest Build
 on: [push, pull_request]

 jobs:
@@ -45,9 +45,6 @@ jobs:
        run: >-
          bash installdeps; if [ "${{ matrix.build_compiler }}" = clang ]; then sudo apt -y install clang; fi

-      - name: Install xvfb
-        run: sudo apt -y install xvfb
-
      # CMake build
      - if: matrix.build_options != 'libretro'
        name: Configure CMake
@@ -61,11 +58,6 @@ jobs:
        run: sudo ninja -C build install

      # Libretro build
-      - if: matrix.build_options == 'libretro'
-        name: Build libretro core
+      - name: Build libretro core
+        if: matrix.build_options == 'libretro'
        run: make -C src/libretro ${{ matrix.libretro_build }}
-
-      # Run tests
-      - if: matrix.build_options == 'default'
-        name: Run tests
-        run: cd build && xvfb-run ctest -j --output-on-failure
--- a/.github/workflows/visual-studio-build.yml
+++ b/.github/workflows/visual-studio-build.yml
@@ -1,4 +1,4 @@
-name: Visual Studio
+name: Visual Studio Build
 on: [push, pull_request]

 jobs:
@@ -53,8 +53,3 @@ jobs:

      - name: Build
        run: cmake --build build
-
-      # Run tests
-      - if: matrix.build_options == 'default' && matrix.msvc_arch != 'amd64_arm64'
-        name: Run tests
-        run: cd build && ctest -j --output-on-failure
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,4 @@
-[submodule "win32-deps"]
-	path = win32-deps
-	url = https://github.com/visualboyadvance-m/win32-deps.git
-[submodule "third_party/googletest"]
-	path = third_party/googletest
-	url = https://github.com/google/googletest.git
+[submodule "dependencies"]
+	path = dependencies
+	url = https://github.com/visualboyadvance-m/dependencies.git
+	branch = master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,68 +4,6 @@ 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.1.11] - 2024-09-15 
-
-==========================
-* 3eea90af - build: set BUILD_TESTING=OFF when not git checkout [rkitover]
-* b3952d74 - build: fix ENABLE_LIRC=ON [rkitover]
-* f264e7f8 - Fix Help -> Translations URL [rkitover]
-* 61f427de - Write shortcuts in the proper section (#1335) [Steelskin]
-* d619ee2b - build: fix installing GoogleTest [rkitover]
-* 26207038 - Update WinSparkle to 0.8.1 and add ARM64 [rkitover]
-
-## [2.1.10] - 2024-09-08 
-
-==========================
-* 7f06428d - Disable dialog position save/restore on wxGTK (#1331) [Steelskin]
-* e4ef4aa6 - Propagate key events (#1323) [Steelskin]
-* e2cf6ecb - Add option to mute sound during speedup [rkitover]
-* d516683a - build: fix for wx using GTK2 [rkitover]
-* 834c7de8 - build: update macOS builder dists [rkitover]
-* fc82e062 - build: do not build SDL bin on Windows or macOS [rkitover]
-* d543784a - [UserInput] Filter key events globally [steelskin]
-* 902c6c8e - [UserInput] Only process shortcut commands once [steelskin]
-* b7765092 - [bindings] Set default shortcut for recent file 3 [steelskin]
-* cc65ef28 - doc: add system requirements to README.md [danialhorton]
-* 32627f6b - [Dialogs] Save and restore dialog positions [steelskin]
-* 41952d06 - build: update macOS linker tool to 1.5 [rkitover]
-* 0c39a5ba - build: override FindGettext to not update po files [rkitover]
-* 1b77d659 - build: update macOS build to ffmpeg 7.0 [rkitover]
-* 8d08223d - build: fix compatibility with older ffmpeg [rkitover]
-* af6028a9 - build: fix build for nix on macOS [rkitover]
-* b52edf52 - build: fix building on macOS with Homebrew [rkitover]
-* 6766b9ca - build: fix ffmpeg 7.x compat [rkitover]
-* 795f25bb - build: fix nix deps for OpenGL [rkitover]
-* 647be137 - gba: set cpsr=spsr when switching to FIQ mode [40356555+Aikku93]
-* 8abe3e79 - build: remove -lgcc from static link flags [rkitover]
-* f4835674 - [Audio] Rework audio devices enumeration [steelskin]
-* 775a571f - build: fix detecting Visual Studio default vcpkg [rkitover]
-* 64abd3e8 - [Audio] Remove manual memory allocations [steelskin]
-* 047ad277 - [Dialogs] Prevent viewers from causing a crash [steelskin]
-* 045c98d8 - build: only use -Werror=lto-type-mismatch on gcc [rkitover]
-* 3518dc6a - build: fix LTO on Linux [rkitover]
-* cc9a03ce - Add toggle: SDL GameController mode for joysticks [rkitover]
-* 8576733c - [Build] Remove lingering references to OpenAl [steelskin]
-* 05561922 - build: fix MSYS2 check [rkitover]
-* d9432ebb - build: fix build on MINGW{64,32}/UCRT64 on MSYS2 [rkitover]
-* f57cad67 - build: fix static linking on MSYS2 CLANG64 [rkitover]
-* 23e15734 - build: set wxWidgets_DIR with vcpkg [rkitover]
-* 98b51910 - [Build] Remove ENABLE_NLS, fix TRANSLATIONS_ONLY [steelskin]
-* a565cea8 - [Build] Remove the OpenGL check [steelskin]
-* f96e42fe - build: cmake refactor and improvements [Steelskin]
-* 07e49025 - Fix most remaining release warnings (#1243) [Steelskin]
-* 18b97b43 - Fix various build warnings (#1242) [Steelskin]
-* 13a16eb7 - Fix various warnings in filters and headers (#1241) [Steelskin]
-* f46da1c5 - build: remove our version of FindSDL2.cmake [rkitover]
-* 404e9a1a - build: add clang to ./installdeps for MSYS2 [rkitover]
-* 613bd403 - Make menu more reasonably organized (#1230) [wwrustc]
-* 215e3c5a - build: use find_program() to find powershell [rkitover]
-* e5aa685f - build: don't use wx utils as UNIX cmds on Windows [rkitover]
-* 9e4c8e17 - build: fix gentoo dependency namespaces [68k]
-* 5f853b99 - Update metainfo.xml to new standards [jhonny.oliveira]
-* e7d135db - Update links to new domain visualboyadvance-m.org [rkitover]
-* 60fc096f - build: add libglu-devel for solus in installdeps [rkitover]
-
 ## [2.1.9] - 2024-02-03
 =======================
 * 84b0a3e3 - Remove SDL sound driver [rkitover]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)

 if(WIN32)
    include(RemoveStrawberryPerlFromPATH)
-
-    find_program(POWERSHELL
-        NAMES powershell.exe pwsh.exe
-        HINTS "/Windows/System32/WindowsPowerShell/v1.0"
-        REQUIRED)
-else()
-    find_program(POWERSHELL pwsh)
 endif()

 if(UPDATE_APPCAST)
@@ -25,10 +18,20 @@ endif()
 set(VCPKG_DEPS pkgconf zlib pthreads "sdl2[samplerate]" gettext wxwidgets)

 set(VCPKG_DEPS_OPTIONAL
+    sfml   ENABLE_LINK
    ffmpeg ENABLE_FFMPEG
    faudio ENABLE_FAUDIO
 )

+if(WIN32)
+    find_program(POWERSHELL
+        NAMES powershell.exe pwsh.exe
+        HINTS "/Windows/System32/WindowsPowerShell/v1.0"
+        REQUIRED)
+else()
+    find_program(POWERSHELL pwsh)
+endif()
+
 include(Set-Toolchain-vcpkg)

 # Use ccache if available and not already enabled on the command line.
@@ -51,7 +54,7 @@ if(GIT_FOUND AND WIN32)
    # Win32 deps submodule
    set(SUBMODULE_MANUAL_UPDATE FALSE)

-    if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include")
+    if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
        set(SUBMODULE_MANUAL_UPDATE TRUE)
        execute_process(
            COMMAND "${GIT_EXECUTABLE}" submodule update --init --remote --recursive
@@ -60,7 +63,7 @@ if(GIT_FOUND AND WIN32)
        )
    endif()

-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include")
+    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
        if(NOT (SUBMODULE_MANUAL_UPDATE AND SUBMODULE_UPDATE_STATUS EQUAL 0))
            message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive")
        endif()
@@ -74,39 +77,6 @@ set(CMAKE_C_STANDARD_REQUIRED True)

 project(VBA-M C CXX)

-include(CTest)
-include(FetchContent)
-include(GNUInstallDirs)
-include(Architecture)
-include(Options)
-include(Toolchain)
-include(Dependencies)
-
-# Disable tests when not in a git checkout.
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    set(BUILD_TESTING OFF)
-endif()
-
-# Configure gtest
-if(BUILD_TESTING)
-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-    set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-
-    if(NOT EXISTS third_party/googletest/CMakeLists.txt)
-        execute_process(
-            COMMAND git submodule update --init --recursive -- third_party/googletest
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-    endif()
-
-    if(EXISTS third_party/googletest/CMakeLists.txt)
-        add_subdirectory(./third_party/googletest)
-        include(GoogleTest)
-    else()
-        set(BUILD_TESTING OFF)
-    endif()
-endif()
-
 if(NOT CMAKE_PREFIX_PATH AND (NOT ("$ENV{CMAKE_PREFIX_PATH}" STREQUAL "")))
    set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
 endif()
@@ -117,11 +87,27 @@ elseif(NOT CMAKE_BUILD_TYPE MATCHES "^(Release|Debug|RelWithDebInfo|MinSizeRel)$
    message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE: '${CMAKE_BUILD_TYPE}', must be one of: 'Release', 'Debug', 'RelWithDebInfo' or 'MinSizeRel'")
 endif()

+# Link debug libs for RelWithDebInfo
+if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "Debug")
+endif()
+
 set(MSYS OFF)
 if(NOT "$ENV{MSYSTEM_PREFIX}" STREQUAL "")
    set(MSYS ON)
 endif()

+include(CTest)
+if(BUILD_TESTING)
+    enable_testing()
+endif()
+
+include(GNUInstallDirs)
+include(Options)
+include(Architecture)
+include(Toolchain)
+include(Dependencies)
+
 if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
    include(GitTagVersion)
    git_version(VBAM_VERSION VBAM_REVISION VBAM_VERSION_RELEASE)
@@ -182,18 +168,8 @@ endif()
 set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)

 if(NOT TRANSLATIONS_ONLY)
-    include_directories(third_party/include/nonstd)
-    include_directories(third_party/include/ghc)
+    add_subdirectory(third_party/include/nonstd)
    add_subdirectory(third_party/include/stb)
-
-    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)
@@ -207,5 +183,5 @@ set(CPACK_SOURCE_GENERATOR "TGZ")
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "0-Git-${COMMITHASH}")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/win32-deps")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/dependencies")
 include(CPack)
--- a/DEVELOPER-MANUAL.md
+++ b/DEVELOPER-MANUAL.md
@@ -9,15 +9,17 @@
    - [Commit Message](#commit-message)
    - [Collaboration on a Branch](#collaboration-on-a-branch)
    - [Commits from Maintainers](#commits-from-maintainers)
-  - [Miscellaneous](#miscellaneous)
-    - [Debug Messages](#debug-messages)
+  - [Strings, Character Sets and Translations](#strings-character-sets-and-translations)
+    - [Pulling Updated Translations](#pulling-updated-translations)
+    - [Translations Message Catalog](#translations-message-catalog)
+    - [Interaction with non-wxWidgets Code](#interaction-with-non-wxwidgets-code)
+  - [Windows Native Development Environment Setup](#windows-native-development-environment-setup)
  - [Release Process](#release-process)
-    - [Certificates](#certificates)
+    - [Environment](#environment)
    - [Release Commit and Tag](#release-commit-and-tag)
    - [64-bit Windows Binary](#64-bit-windows-binary)
    - [32-bit Windows Binary](#32-bit-windows-binary)
-    - [ARM64 Windows Binary](#arm64-windows-binary)
-    - [macOS Binary](#macos-binary)
+    - [64-bit Mac Binary](#64-bit-mac-binary)
    - [Final steps](#final-steps)

 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -51,12 +53,11 @@ Follow the following steps to process newly submitted issues:
 - 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.
+- 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
  needed.
-
 - A commit that is work towards resolving an issue, should have the issue number
  preceded by a pound sign either at the end of a commit message title, if it is
  of primary relevance to the issue, or the body otherwise.
@@ -69,7 +70,7 @@ Follow these guidelines always:

 https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

-, the description of your work should be in the **commit message NOT the pull
+the description of your work should be in the **commit message NOT the pull
 request description**.

 The title line must be no more than 50 characters and the description must be
@@ -94,21 +95,16 @@ other projects, fewer is better.
 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.

-If the commit is a user-facing functionality change or enhancement, the title
-line of the commit must be a non-technical description of this change. For
-example "Mute on speedup" because this will go into the changelog.
-
 The text after the area prefix should not be capitalized.

-Please use one of these area prefixes for non-main-GUI-app commits:
+Please use one of these area prefixes otherwise:

 - 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
+- build: cmake, installdeps, preprocessor compatibility defines, etc.
+- gb-core: the GameBoy emulator core
+- gba-core: the GameBoy Advance emulator core
 - libretro: the libretro core glue and build
- sdl: anything for the SDL port
+- sdl-app: anything for the SDL app
 - translations: anything related to translations

 . Add other areas here if needed.
@@ -142,79 +138,137 @@ 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 (very rudely you might say) did a `push -f`, `pull
+  --rebase` will **USUALLY** work. Verify the log, and if necessary do this
+  instead:
+
 ```bash
 git status # should be clean, with your work having been already pushed
 git fetch --all --prune
 git reset --hard origin/<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.

 #### Commits from Maintainers

-Maintainers and project members have the power to commit directly to master.
-This power must be used responsibly.
+Maintainers have the power to commit directly to master. This power must be
+used responsibly, something I fail to do myself often, and will try to improve
+upon.

-Make your best attempt to follow these general guidelines to keep our
+Make your most earnest attempt to follow these general guidelines to keep our
 history clean:

- Things that are a minor fix or improvement that does not require discussion
+- Things that are a straight fix or improvement that does not require discussion
  can be committed directly, keeping the following guidelines in mind.

 - Bigger new features, code refactors and changes in architecture should go
  through the PR process.

- 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.
+- Push code changes to a branch first, so they can run through the CI.
+  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.

-### Miscellaneous

-#### Debug Messages
+### Strings, Character Sets and Translations

-We have an override for `wxLogDebug()` to make it work even in non-debug builds
-of wx and on windows, even in mintty.
+#### Pulling Updated Translations

-It works like `printf()`, e.g.:
+Once in a while it is necessary to pull new and updated translations from
+transifex.

-```cpp
-int foo = 42;
-wxLogDebug(wxT("the value of foo = %d"), foo);
+For this you need the transifex client, available for Windows as well from
+chocolatey as `transifex-client`.
+
+To pull translations run:
+
+```bash
+tx pull -af
 ```

-From the core etc. the usual:
+then check `git status` and if any message catalogs were updated, commit the
+result as:
+
+```bash
+git commit -a --signoff -S -m'Transifex pull.'
+git push
+```
+
+#### Translations Message Catalog
+
+Strings that need to be translated by our wonderful translators on transifex
+(thank you guys very much) need to be enclosed in `_("...")`, for example:

 ```cpp
-fprintf(stderr, "...", ...);
+wxLogError(_("error: something very wrong"));
 ```
-, 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.
+The next time you run cmake after adding a string to be translated, the `.pot`
+message catalog source will be regenerated, and you will see a loud message
+telling you to push to transifex.
+
+Strings in the XRC XML GUI definition files are automatically added to the
+message catalog as well.
+
+If you are working on a branch or a PR, don't push to transifex until it has
+been merged to master.
+
+Once it is, push it with:
+
+```bash
+tx push -s
+```
+
+#### Interaction with non-wxWidgets Code
+
+Use our `UTF8(...)` function to force any `wxString` to UTF-8 for use by other
+libraries, screen output or OS APIs. For example:
+
+```cpp
+fprintf(STDERR, "Error: %s\n", UTF8(err_msg));
+```
+
+There is one exception to this, when using `wxString::Printf()` and such, you
+can't pass another `wxString` to the `%s` format directly, use something like
+this:
+
+```cpp
+wxString err;
+err.Printf("Cannot read file: %s", fname.wc_str());
+```
+
+this uses the `wchar_t` UTF-16 representation on Windows and does nothing
+elsewhere.
+
+For calling Windows APIs with strings, use the wide char `W` variants and the
+`wc_str()` method as well.
+
+### Windows Native Development Environment Setup
+
+This guide has been moved to:
+
+https://github.com/rkitover/windows-dev-guide

 ### Release Process

-#### GnuPG Key
+#### Environment

-You will need to create a GnuPG key for signing your commits and release tags,
-and upload it to a keyserver.
+The variable `VBAM_NO_PAUSE`, if set, will cause cmake to not pause before gpg
+signing operations, you want to set this if you've disabled your gpg passphrase
+to not require interaction during release builds.

-Make sure to install GnuPG on all environments where you will be making commits
-and tags.
+gpg set up with your key is helpful for the release process on all environments
+where a binary is built, but you can also make the detached signature files
+yourself at the end of the process.

-#### Certificates
+For codesigning windows binaries, put your certificate into
+`~/.codesign/windows_comodo.pkcs12`.

-Make sure you have set up a Windows code signing certificate with the right
-password and a Mac 'Developer ID Application' certificate.
-
-Put the Windows certificate into `~/.codesign/windows_comodo.pkcs12` as a PKCS12
-file that is password protected, and put the password for it into
-`~/.codesign/windows_comodo.pkcs12.password`.
+On Mac the 'Developer ID Application' certificate stored in your login keychain
+is used, `keychain unlock` will prompt you for your login keychain password, to
+avoid that set the `LOGIN_KEYCHAIN_PASSWORD` environment variable to your
+password.

 #### Release Commit and Tag

@@ -226,10 +280,8 @@ tag:
 mkdir build && cd build
 cmake .. -DTAG_RELEASE=TRUE
 ```
-, follow the instructions to edit the `CHANGELOG.md` and then push the release:

-To reiterate, **make sure you edit the `CHANGELOG.md`** to remove any
-non-user-facing changes before you make the release commit.
+then push the release:

 ```bash
 git push
@@ -244,126 +296,84 @@ cmake .. -DTAG_RELEASE=UNDO

 #### 64-bit Windows Binary

-For this you will preferably need the PowerShell environment setup described
-[here](https://github.com/rkitover/windows-dev-guide), or by starting the `x64
-Native Tools Command Prompt` from your Start Menu.
+For this you will preferably need the powershell environment setup described
+earlier, however you can use a regular Visual Studio 64 bit native developer
+command prompt as well.

 ```powershell
-mkdir build-msvc64
-cd build-msvc64
-cmake .. -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
+mkdir build
+cd build
+cmake .. -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
 ninja
 ```

 Collect the following files for the release:

- `visualboyadvance-m-Win-x86_64.zip`
+- `visualboyadvance-m-Win-64bit.zip`
+- `visualboyadvance-m-Win-64bit.zip.asc`
 - `translations.zip`
-
-Repeat the process for the debug build, with `-DCMAKE_BUILD_TYPE=Debug` and
-collect this file:
-
- `visualboyadvance-m-Win-x86_64-debug.zip`
-.
+- `translations.zip.asc`

 #### 32-bit Windows Binary

-The 32-bit build is a legacy build for Windows XP compatibility. You will need
-the MinGW toolchain to build it. The easiest method is to use the MINGW32 MSYS2
-environment.
+For this the optimal environment is a linux distribution with the mingw
+toolchain, I use fedora.

-Make sure the Visual Studio `signtool.exe` is in your path, you can start MSYS2
-with an inherited `PATH` from a Visual Studio enabled environment or add it to
-your shell configuration.
+You can set up a shell on a fedora distribution with docker as described here:

-First install dependencies with:
+https://gist.github.com/rkitover/6379764c619c10e829e4b2fa0ae243fd
+
+If using fedora, the cross script will install all necessary dependencies, if
+not install the base toolchain (mingw gcc, binutils, winpthreads) using the
+preferred method for your distribution, you can also use mxe for this.
+
+https://mxe.cc/

 ```bash
-./installdeps
+sh tools/win/linux-cross-builder -32
 ```
-. Then build the 32-bit binary as follows:
+
+You can also use msys2 on Windows, this is not recommended:

 ```bash
-mkdir build-mingw32
-cd build-mingw32
-cmake .. -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
-ninja
+sh tools/win/msys2-builder -32
 ```
-. Collect this file for the release:

- `visualboyadvance-m-Win-x86_32.zip`
+To set up msys2, see this guide:

-. Then repeat the process for the debug build with `-DCMAKE_BUILD_TYPE=Debug`,
-and collect this file:
+https://gist.github.com/rkitover/d008324309044fc0cc742bdb16064454

- `visualboyadvance-m-Win-x86_32-debug.zip`
-.
+Collect the following files from `~/vbam-build-mingw32/project` if using linux,
+or `~/vbam-build-msys2-x86_64/project` if using msys2:

-#### ARM64 Windows Binary
+- `visualboyadvance-m-Win-32bit.zip`
+- `visualboyadvance-m-Win-32bit.zip.asc`

-You will need the MSVC ARM64 cross toolchain to build this binary, if you used
-the install script from [here](https://github.com/rkitover/windows-dev-guide)
-you will have it installed, otherwise run Visual Studio Installer and install
-the component.
-
-To enter the ARM64 cross environment, edit the PowerShell profile described
-[here](https://github.com/rkitover/windows-dev-guide) or use the `vcvarsall.bat`
-script with the `amd64_arm64` argument as described
-[here](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170).
-
-From there the process is the same as for the 64-bit build, collect the
-following files for the release:
-
- `visualboyadvance-m-Win-arm64.zip`
- 'visualboyadvance-m-Win-arm64-debug.zip'
-.
-
-#### macOS Binary
+#### 64-bit Mac Binary

 Install the latest Xcode for your OS.

-You will need bash from Homebrew/nix/MacPorts/whatever to run the build script.
+You will need bash and (optionally) gpg from homebrew (which you will also need
+to install):
+
+```bash
+brew install bash gnupg
+```

 You will need a codesigning certificate from Apple, which you will be able to
-generate once you join their developer program from XCode. This is the
-certificate of the type 'Developer ID Application' stored in your login
-keychain.
-
-If you are not using a GUI session, you will need to use a method to unlock your
-login keychain before building so that your codesigning certificate can be used.
-Adding the certificate and key to the System keychain is also a method that some
-people use.
-
-To unlock your keychain on login, you can add something like this to your
-`~/.zshrc`:
+generate once you join their developer program. This is the certificate of the
+type 'Developer ID Application' stored in your login keychain. `keychain
+unlock` will prompt you for your login keychain password, to avoid that set the
+`LOGIN_KEYCHAIN_PASSWORD` environment variable to your password.

 ```bash
-security unlock-keychain -p "$(cat ~/.login-keychain-password)" login.keychain
+/usr/local/bin/bash tools/osx/builder -64
 ```
-, with your login password in that file.
-
-For notarization to work, you will need to create an app-specific password on
-https://appleid.apple.com , get your Team ID from your Apple Developer account,
-and store them with this command:
-
-```bash
-xcrun notarytool store-credentials AC_PASSWORD \
-               --apple-id you@domain.com \
-               --team-id <DeveloperTeamID> \
-               --password <secret_app_specific_2FA_password>
-```
-. Once all of this is set up, run:
-
-```bash
-tools/osx/builder
-```
-, this will take a while because it builds all of the dependencies.

 Collect the following files from `~/vbam-build-mac-64bit/project`:

- `visualboyadvance-m-Mac-x86_64.zip`
- `visualboyadvance-m-Mac-x86_64-debug.zip`
-.
+- `visualboyadvance-m-Mac-64bit.zip`
+- `visualboyadvance-m-Mac-64bit.zip.asc`

 #### Final steps

@@ -371,26 +381,27 @@ Go to the github releases tab, and make a release for the tag you pushed
 earlier.

 Put any notes to users and distro maintainers into the description as well as
-the generated entries from `CHANGELOG.md` you edited earlier.
+the entries from `CHANGELOG.md` generated earlier from git by the release
+commit script.

 Upload all files collected during the earlier builds, the complete list is:


 - `translations.zip`
- `visualboyadvance-m-Win-x86_64.zip`
- `visualboyadvance-m-Win-x86_64-debug.zip`
- `visualboyadvance-m-Win-x86_32.zip`
- `visualboyadvance-m-Win-x86_32-debug.zip`
- `visualboyadvance-m-Win-arm64.zip`
- 'visualboyadvance-m-Win-arm64-debug.zip'
- `visualboyadvance-m-Mac-x86_64.zip`
- `visualboyadvance-m-Mac-x86_64-debug.zip`
+- `translations.zip.asc`
+- `visualboyadvance-m-Mac-64bit.zip`
+- `visualboyadvance-m-Mac-64bit.zip.asc`
+- `visualboyadvance-m-Win-32bit.zip`
+- `visualboyadvance-m-Win-32bit.zip.asc`
+- `visualboyadvance-m-Win-64bit.zip`
+- `visualboyadvance-m-Win-64bit.zip.asc`

-Update the winsparkle `appcast.xml` by running this cmake command:
+Update the winsparkle appcast.xml by running this cmake command:

 ```bash
 cmake .. -DUPDATE_APPCAST=TRUE
 ```
-, follow the instructions to push the change to the web data repo.
+
+follow the instructions to push the change to the web data repo.

 Announce the release on reddit r/emulation and the forum.
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@

 <!-- END doctoc generated TOC please keep comment here to allow auto update -->

+[![Join the chat at https://gitter.im/visualboyadvance-m/Lobby](https://badges.gitter.im/visualboyadvance-m/Lobby.svg)](https://gitter.im/visualboyadvance-m/Lobby)
+
 Our bridged Discord server is [Here](https://discord.gg/EpfxEuGMKH).

 We are also on *`#vba-m`* on [Libera IRC](https://libera.chat/) which has a [Web
@@ -57,39 +59,35 @@ Factory Reset`.

 ## System Requirements

-Windows XP, Vista, 7, 8.1 or 10/11, Linux distros or macOS.
+Windows 7, 8.1 or 10/11, Linux distro's or macOS.

 2Ghz x86(or x86-64) Intel Core 2 or AMD Athlon processor with SSE, Snapdragon 835 
-or newer CPU compatible with Arm for Windows.
-
+or newer cpu compatible with Arm for Windows.
 - Just a guideline, lower clock speeds and Celeron processors may be able to run at full
-speed on lower settings, and Linux based ARM Operating systems have wider CPU support.
+speed on lower settings, and Linux based ARM Operating systems have wider cpu support.

-DirectX June 2010 Redist
-[Full](https://www.microsoft.com/en-au/download/details.aspx?id=8109) /
-[Websetup](https://www.microsoft.com/en-au/download/details.aspx?id=35) for
-Xaudio (Remember to uncheck Bing on the websetup.)
+DirectX June 2010 Redist [Full](https://www.microsoft.com/en-au/download/details.aspx?id=8109) / [Websetup](https://www.microsoft.com/en-au/download/details.aspx?id=35) for Xaudio (Remember to uncheck Bing on the websetup)

 ## Building

 The basic formula to build vba-m is:

-```bash
+```shell
 cd ~ && mkdir src && cd src
 git clone https://github.com/visualboyadvance-m/visualboyadvance-m.git
 cd visualboyadvance-m
+./installdeps

-./installdeps # On Linux or macOS
+# ./installdeps will give you build instructions, which will be similar to:

-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
+mkdir build && cd build
+cmake .. -G Ninja
 ninja
 ```

-`./installdeps` is supported on MSYS2, Linux (Debian/Ubuntu, Fedora, Arch,
-Solus, OpenSUSE, Gentoo and RHEL/CentOS) and Mac OS X (homebrew, MacPorts or
-Fink.)
+`./installdeps` is supported on MSys2, Linux (Debian/Ubuntu, Fedora, Arch,
+Solus, OpenSUSE, Gentoo and RHEL/CentOS) and Mac OS X (homebrew, macports or
+fink.)

 ## Building a Libretro core

@@ -100,7 +98,7 @@ cd src/libretro
 make -j`nproc`
 ```

-Copy `vbam_libretro.so` to your RetroArch cores directory.
+Copy vbam_libretro.so to your RetroArch cores directory.

 ## Visual Studio Support

@@ -120,16 +118,14 @@ environment loaded.
 Using your own user-wide installation of vcpkg is supported, just make sure the
 environment variable `VCPKG_ROOT` is set.

-To build in the Visual Studio `x64 Native Tools Command Prompt`, use something
-like this:
+To build in the visual studio command prompt, use something like this:

 ```
 mkdir build
 cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
+cmake .. -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Debug -G Ninja
 ninja
 ```
-.

 ## Visual Studio Code Support

@@ -166,7 +162,8 @@ 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)
+- [SFML](https://www.sfml-dev.org/) (optional, for link)
+- [OpenAL](https://www.openal.org/) or [openal-soft](https://kcat.strangesoft.net/openal.html) (required, 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
@@ -186,46 +183,61 @@ This is supported on Fedora, Arch, Solus and MSYS2.
 may be `win32` which is an alias for `mingw-w64-i686` to target 32 bit Windows,
 or `mingw-w64-x86_64` for 64 bit Windows targets.

-The target is implicit on MSYS2 depending on which MINGW shell you started (the
+The target is implicit on MSys2 depending on which MINGW shell you started (the
 value of `$MSYSTEM`.)

 On Debian/Ubuntu this uses the MXE apt repository and works quite well.

+On Fedora it can build using the Fedora MinGW packages, albeit with wx 2.8, no
+OpenGL support, and no Link support for lack of SFML.
+
+On Arch it currently doesn't work at all because the AUR stuff is completely
+broken, I will at some point redo the arch stuff to use MXE as well.
+
 ## CMake Options

 The CMake code tries to guess reasonable defaults for options, but you can
 override them, for example:

 ```shell
-cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_LINK=NO -G Ninja
+cmake .. -DENABLE_LINK=NO -G Ninja
 ```
-. Here is the complete list:
+
+Of particular interest is making **Release** or **Debug** builds, the default
+mode is **Release**, to make a **Debug** build use something like:
+
+```shell
+cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja
+```
+
+Here is the complete list:

 | **CMake Option**      | **What it Does**                                                     | **Defaults**          |
 |-----------------------|----------------------------------------------------------------------|-----------------------|
-| `ENABLE_SDL`            | Build the SDL port                                                   | OFF                   |
-| `ENABLE_WX`             | Build the wxWidgets port                                             | ON                    |
-| `ENABLE_DEBUGGER`       | Enable the debugger                                                  | ON                    |
-| `ENABLE_ASM_CORE`       | Enable x86 ASM CPU cores (**BUGGY AND DANGEROUS**)                   | OFF                   |
-| `ENABLE_ASM`            | Enable the following two ASM options                                 | ON for 32 bit builds  |
-| `ENABLE_ASM_SCALERS`    | Enable x86 ASM graphic filters                                       | ON for 32 bit builds  |
-| `ENABLE_MMX`            | Enable MMX                                                           | ON for 32 bit builds  |
-| `ENABLE_LINK`           | Enable GBA linking functionality                                     | AUTO                  |
-| `ENABLE_LIRC`           | Enable LIRC support                                                  | OFF                   |
-| `ENABLE_FFMPEG`         | Enable ffmpeg A/V recording                                          | AUTO                  |
-| `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_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                   |
-| `UPSTREAM_RELEASE`      | Do some release tasks, like codesigning, making zip and gpg sigs.    | OFF                   |
-| `BUILD_TESTING`         | Build the tests and enable ctest support.                            | ON                    |
-| `VBAM_STATIC`           | Try link all libs statically (the following are set to ON if ON)     | OFF                   |
-| `SDL2_STATIC`           | Try to link static SDL2 libraries                                    | OFF                   |
-| `FFMPEG_STATIC`         | Try to link static ffmpeg libraries                                  | OFF                   |
-| `OPENAL_STATIC`         | Try to link static OpenAL libraries                                  | OFF                   |
-| `TRANSLATIONS_ONLY`     | Build only the translations.zip and nothing else                     | OFF                   |
+| ENABLE_SDL            | Build the SDL port                                                   | OFF                   |
+| ENABLE_WX             | Build the wxWidgets port                                             | ON                    |
+| ENABLE_DEBUGGER       | Enable the debugger                                                  | ON                    |
+| ENABLE_ASM_CORE       | Enable x86 ASM CPU cores (**BUGGY AND DANGEROUS**)                   | OFF                   |
+| ENABLE_ASM            | Enable the following two ASM options                                 | ON for 32 bit builds  |
+| ENABLE_ASM_SCALERS    | Enable x86 ASM graphic filters                                       | ON for 32 bit builds  |
+| ENABLE_MMX            | Enable MMX                                                           | ON for 32 bit builds  |
+| ENABLE_LINK           | Enable GBA linking functionality (requires SFML)                     | AUTO                  |
+| ENABLE_LIRC           | Enable LIRC support                                                  | OFF                   |
+| ENABLE_FFMPEG         | Enable ffmpeg A/V recording                                          | AUTO                  |
+| 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_DIRECT3D       | Direct3D rendering for wxWidgets (Windows, **NOT IMPLEMENTED!!!**)   | ON                    |
+| ENABLE_XAUDIO2        | Enable xaudio2 sound output for wxWidgets (Windows only)             | ON                    |
+| ENABLE_ASAN           | Enable libasan sanitizers (by default address, only in debug mode)   | OFF                   |
+| UPSTREAM_RELEASE      | Do some release tasks, like codesigning, making zip and gpg sigs.    | OFF                   |
+| BUILD_TESTING         | Build the tests and enable ctest support.                            | ON                    |
+| VBAM_STATIC           | Try link all libs statically (the following are set to ON if ON)     | OFF                   |
+| SDL2_STATIC           | Try to link static SDL2 libraries                                    | OFF                   |
+| SFML_STATIC_LIBRARIES | Try to link static SFML libraries                                    | OFF                   |
+| FFMPEG_STATIC         | Try to link static ffmpeg libraries                                  | OFF                   |
+| OPENAL_STATIC         | Try to link static OpenAL libraries                                  | OFF                   |
+| TRANSLATIONS_ONLY     | Build only the translations.zip and nothing else                     | OFF                   |

 Note for distro packagers, we use the CMake module
 [GNUInstallDirs](https://cmake.org/cmake/help/v2.8.12/cmake.html#module:GNUInstallDirs)
@@ -235,6 +247,52 @@ On Unix to use a different version of wxWidgets, set
 `wxWidgets_CONFIG_EXECUTABLE` to the path to the `wx-config` script you want to
 use.

+## MSys2 Notes
+
+To run the resulting binary, you can simply type:
+
+```shell
+./visualboyadvance-m
+```
+
+in the shell where you built it.
+
+If you built with `-DCMAKE_BUILD_TYPE=Debug`, you will get a console app and
+will see debug messages, even in mintty.
+
+If you want to start the binary from e.g. a shortcut or Explorer, you will need
+to put `c:\msys64\mingw32\bin` for 32 bit builds and `c:\msys64\mingw64\bin`
+for 64 bit builds in your PATH (to edit system PATH, go to Control Panel ->
+System -> Advanced system settings -> Environment Variables.)
+
+If you want to package the binary, you will need to include the MinGW DLLs it
+depends on, they can install to the same directory as the binary.
+
+Our own builds are static.
+
+## 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.
+
+It works like `printf()`, e.g.:
+
+```cpp
+int foo = 42;
+wxLogDebug(wxT("the value of foo = %d"), foo);
+```
+
+From the core etc. the usual:
+
+```cpp
+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.
+
 ## Reporting Crash Bugs

 If the emulator crashes and you wish to report the bug, a backtrace made with
@@ -253,25 +311,27 @@ do something such as:
 ```shell
 ulimit -c unlimited
 ```
-, in your shell to enable core files.
+
+in your shell to enable coredump files.

 [This
 post](https://ask.fedoraproject.org/en/question/98776/where-is-core-dump-located/?answer=98779#post-id-98779)
-explains how to retrieve core dump on some distributions, when they are managed
-by systemd.
+explains how to retrieve core dump on Fedora Linux (and possibly other
+distributions.)

-Once you have the core file, open it with `gdb`, for example:
+Once you have the core dump file, open it with `gdb`, for example:

 ```shell
 gdb -c core ./visualboyadvance-m
 ```
-. In the `gdb` shell, to start the process and print the backtrace, type:
+
+In the `gdb` shell, to print the backtrace, type:

 ```
-run
 bt
 ```
-. This may be a bit of a hassle, but it helps us out immensely.
+
+This may be a bit of a hassle, but it helps us out immensely.

 ## Contributing

--- a/cmake/Architecture.cmake
+++ b/cmake/Architecture.cmake
@@ -56,12 +56,10 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
    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)
-        set(ARCH_NAME ARM32)
+        set(ARCH_NAME arm32)
        set(WINARCH arm)
    elseif(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
-        set(ARM64 ON)
-        set(ARCH_NAME ARM64)
+        set(ARCH_NAME arm64)
        set(WINARCH arm64)
    endif()

--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -23,7 +23,7 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
        if(VCPKG_TARGET_TRIPLET MATCHES -static)
            set(arch_suffix  -static)
        endif()
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
            set(path_prefix debug)
        endif()
        set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
@@ -119,3 +119,4 @@ if(ENABLE_LINK OR ENABLE_WX)
        message(FATAL_ERROR "NLS requires libintl/gettext")
    endif()
 endif()
+
--- a/cmake/FindOpenAL.cmake
+++ b/cmake/FindOpenAL.cmake
@@ -0,0 +1,110 @@
+#.rst:
+# FindOpenAL
+# ----------
+#
+#
+#
+# Locate OpenAL This module defines OPENAL_LIBRARY OPENAL_FOUND, if
+# false, do not try to link to OpenAL OPENAL_INCLUDE_DIR, where to find
+# the headers
+#
+# $OPENALDIR is an environment variable that would correspond to the
+# ./configure --prefix=$OPENALDIR used in building OpenAL.
+#
+# Created by Eric Wing.  This was influenced by the FindSDL.cmake
+# module.
+
+#=============================================================================
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# This makes the presumption that you are include al.h like
+# #include "al.h"
+# and not
+# #include <AL/al.h>
+# The reason for this is that the latter is not entirely portable.
+# Windows/Creative Labs does not by default put their headers in AL/ and
+# OS X uses the convention <OpenAL/al.h>.
+#
+# For Windows, Creative Labs seems to have added a registry key for their
+# OpenAL 1.1 installer. I have added that key to the list of search paths,
+# however, the key looks like it could be a little fragile depending on
+# if they decide to change the 1.00.0000 number for bug fix releases.
+# Also, they seem to have laid down groundwork for multiple library platforms
+# which puts the library in an extra subdirectory. Currently there is only
+# Win32 and I have hardcoded that here. This may need to be adjusted as
+# platforms are introduced.
+# The OpenAL 1.0 installer doesn't seem to have a useful key I can use.
+# I do not know if the Nvidia OpenAL SDK has a registry key.
+#
+# For OS X, remember that OpenAL was added by Apple in 10.4 (Tiger).
+# To support the framework, I originally wrote special framework detection
+# code in this module which I have now removed with CMake's introduction
+# of native support for frameworks.
+# In addition, OpenAL is open source, and it is possible to compile on Panther.
+# Furthermore, due to bugs in the initial OpenAL release, and the
+# transition to OpenAL 1.1, it is common to need to override the built-in
+# framework.
+# Per my request, CMake should search for frameworks first in
+# the following order:
+# ~/Library/Frameworks/OpenAL.framework/Headers
+# /Library/Frameworks/OpenAL.framework/Headers
+# /System/Library/Frameworks/OpenAL.framework/Headers
+#
+# On OS X, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# OPENAL_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+
+find_path(OPENAL_INCLUDE_DIR al.h
+  HINTS
+    ENV OPENALDIR
+  PATH_SUFFIXES AL OpenAL
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(_OpenAL_ARCH_DIR libs/Win64)
+else()
+  set(_OpenAL_ARCH_DIR libs/Win32)
+endif()
+
+find_library(OPENAL_LIBRARY
+  NAMES OpenAL al openal OpenAL32
+  HINTS
+    ENV OPENALDIR
+  PATH_SUFFIXES lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+)
+
+unset(_OpenAL_ARCH_DIR)
+
+# handle the QUIETLY and REQUIRED arguments and set OPENAL_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL  DEFAULT_MSG  OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
+
+mark_as_advanced(OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
--- a/cmake/FindSFML.cmake
+++ b/cmake/FindSFML.cmake
@@ -0,0 +1,365 @@
+# This script locates the SFML library
+# ------------------------------------
+#
+# Usage
+# -----
+#
+# When you try to locate the SFML libraries, you must specify which modules you want to use (system, window, graphics, network, audio, main).
+# If none is given, the SFML_LIBRARIES variable will be empty and you'll end up linking to nothing.
+# example:
+#   find_package(SFML COMPONENTS graphics window system) # find the graphics, window and system modules
+#
+# You can enforce a specific version, either MAJOR.MINOR or only MAJOR.
+# If nothing is specified, the version won't be checked (i.e. any version will be accepted).
+# example:
+#   find_package(SFML COMPONENTS ...)     # no specific version required
+#   find_package(SFML 2 COMPONENTS ...)   # any 2.x version
+#   find_package(SFML 2.4 COMPONENTS ...) # version 2.4 or greater
+#
+# By default, the dynamic libraries of SFML will be found. To find the static ones instead,
+# you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).
+# Since you have to link yourself all the SFML dependencies when you link it statically, the following
+# additional variables are defined: SFML_XXX_DEPENDENCIES and SFML_DEPENDENCIES (see their detailed
+# description below).
+# In case of static linking, the SFML_STATIC macro will also be defined by this script.
+# example:
+#   set(SFML_STATIC_LIBRARIES TRUE)
+#   find_package(SFML 2 COMPONENTS network system)
+#
+# On Mac OS X if SFML_STATIC_LIBRARIES is not set to TRUE then by default CMake will search for frameworks unless
+# CMAKE_FIND_FRAMEWORK is set to "NEVER" for example. Please refer to CMake documentation for more details.
+# Moreover, keep in mind that SFML frameworks are only available as release libraries unlike dylibs which
+# are available for both release and debug modes.
+#
+# If SFML is not installed in a standard path, you can use the SFML_ROOT CMake (or environment) variable
+# to tell CMake where SFML is.
+#
+# Output
+# ------
+#
+# This script defines the following variables:
+# - For each specified module XXX (system, window, graphics, network, audio, main):
+#   - SFML_XXX_LIBRARY_DEBUG:   the name of the debug library of the xxx module (set to SFML_XXX_LIBRARY_RELEASE is no debug version is found)
+#   - SFML_XXX_LIBRARY_RELEASE: the name of the release library of the xxx module (set to SFML_XXX_LIBRARY_DEBUG is no release version is found)
+#   - SFML_XXX_LIBRARY:         the name of the library to link to for the xxx module (includes both debug and optimized names if necessary)
+#   - SFML_XXX_FOUND:           true if either the debug or release library of the xxx module is found
+#   - SFML_XXX_DEPENDENCIES:    the list of libraries the module depends on, in case of static linking
+# - SFML_LIBRARIES:    the list of all libraries corresponding to the required modules
+# - SFML_FOUND:        true if all the required modules are found
+# - SFML_INCLUDE_DIR:  the path where SFML headers are located (the directory containing the SFML/Config.hpp file)
+# - SFML_DEPENDENCIES: the list of libraries SFML depends on, in case of static linking
+#
+# example:
+#   find_package(SFML 2 COMPONENTS system window graphics audio REQUIRED)
+#   include_directories(${SFML_INCLUDE_DIR})
+#   add_executable(myapp ...)
+#   target_link_libraries(myapp ${SFML_LIBRARIES})
+
+# define the SFML_STATIC macro if static build was chosen
+if(SFML_STATIC_LIBRARIES)
+    add_compile_definitions(SFML_STATIC)
+endif()
+
+# define the list of search paths for headers and libraries
+set(FIND_SFML_PATHS
+    ${SFML_ROOT}
+    $ENV{SFML_ROOT}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local
+    /usr
+    /sw
+    /opt/local
+    /opt/csw
+    /opt)
+
+# find the SFML include directory
+find_path(SFML_INCLUDE_DIR SFML/Config.hpp
+          PATH_SUFFIXES include
+          PATHS ${FIND_SFML_PATHS})
+
+# check the version number
+set(SFML_VERSION_OK TRUE)
+if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
+    # extract the major and minor version numbers from SFML/Config.hpp
+    # we have to handle framework a little bit differently:
+    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+    else()
+        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+    endif()
+    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
+    STRING(REGEX REPLACE ".*#define *SFML_VERSION_MAJOR *([0-9]+).*" "\\1" SFML_VERSION_MAJOR "${SFML_CONFIG_HPP_CONTENTS}")
+    STRING(REGEX REPLACE ".*#define *SFML_VERSION_MINOR *([0-9]+).*" "\\1" SFML_VERSION_MINOR "${SFML_CONFIG_HPP_CONTENTS}")
+    STRING(REGEX REPLACE ".*#define *SFML_VERSION_PATCH *([0-9]+).*" "\\1" SFML_VERSION_PATCH "${SFML_CONFIG_HPP_CONTENTS}")
+    if (NOT "${SFML_VERSION_PATCH}" MATCHES "^[0-9]+$")
+        set(SFML_VERSION_PATCH 0)
+    endif()
+    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10000 + ${SFML_FIND_VERSION_MINOR} * 100 + ${SFML_FIND_VERSION_PATCH}")
+
+    # if we could extract them, compare with the requested version number
+    if (SFML_VERSION_MAJOR)
+        # transform version numbers to an integer
+        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10000 + ${SFML_VERSION_MINOR} * 100 + ${SFML_VERSION_PATCH}")
+
+        # compare them
+        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
+            set(SFML_VERSION_OK FALSE)
+        endif()
+    else()
+        # SFML version is < 2.0
+        if (SFML_REQUESTED_VERSION GREATER 10900)
+            set(SFML_VERSION_OK FALSE)
+            set(SFML_VERSION_MAJOR 1)
+            set(SFML_VERSION_MINOR x)
+            set(SFML_VERSION_PATCH x)
+        endif()
+    endif()
+endif()
+
+# find the requested modules
+set(SFML_FOUND TRUE) # will be set to false if one of the required modules is not found
+foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
+    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+
+    # no suffix for sfml-main, it is always a static library
+    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
+        # release library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                     NAMES ${FIND_SFML_COMPONENT_NAME}
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+
+        # debug library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                     NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+    else()
+        # static release library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_RELEASE
+                     NAMES ${FIND_SFML_COMPONENT_NAME}-s
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+
+        # static debug library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_DEBUG
+                     NAMES ${FIND_SFML_COMPONENT_NAME}-s-d
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+
+        # dynamic release library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_RELEASE
+                     NAMES ${FIND_SFML_COMPONENT_NAME}
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+
+        # dynamic debug library
+        find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_DEBUG
+                     NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                     PATH_SUFFIXES lib64 lib
+                     PATHS ${FIND_SFML_PATHS})
+
+        # choose the entries that fit the requested link type
+        if(SFML_STATIC_LIBRARIES)
+            if(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_RELEASE)
+                set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_RELEASE})
+            endif()
+            if(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_DEBUG)
+                set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_DEBUG})
+            endif()
+        else()
+            if(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_RELEASE)
+                set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_RELEASE})
+            endif()
+            if(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_DEBUG)
+                set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_DEBUG})
+            endif()
+        endif()
+    endif()
+
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+        # library found
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
+
+        # if both are found, set SFML_XXX_LIBRARY to contain both
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
+                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+        endif()
+
+        # if only one debug/release variant is found, set the other to be equal to the found one
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+            # debug and not release
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+        endif()
+        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+            # release and not debug
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+        endif()
+    else()
+        # library not found
+        set(SFML_FOUND FALSE)
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
+        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
+        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+    endif()
+
+    # mark as advanced
+    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_RELEASE
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_STATIC_DEBUG
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_RELEASE
+                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DYNAMIC_DEBUG)
+
+    # add to the global list of libraries
+    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
+endforeach()
+
+# in case of static linking, we must also define the list of all the dependencies of SFML libraries
+if(SFML_STATIC_LIBRARIES)
+
+    # detect the OS
+    if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+        set(FIND_SFML_OS_WINDOWS 1)
+    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+        set(FIND_SFML_OS_LINUX 1)
+    elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+        set(FIND_SFML_OS_FREEBSD 1)
+    elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+        set(FIND_SFML_OS_MACOSX 1)
+    endif()
+
+    # start with an empty list
+    set(SFML_DEPENDENCIES)
+    set(FIND_SFML_DEPENDENCIES_NOTFOUND)
+
+    # macro that searches for a 3rd-party library
+    macro(find_sfml_dependency output friendlyname)
+        # No lookup in environment variables (PATH on Windows), as they may contain wrong library versions
+        find_library(${output} NAMES ${ARGN} PATHS ${FIND_SFML_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH)
+        if(${${output}} STREQUAL "${output}-NOTFOUND")
+            unset(output)
+            set(FIND_SFML_DEPENDENCIES_NOTFOUND "${FIND_SFML_DEPENDENCIES_NOTFOUND} ${friendlyname}")
+        endif()
+    endmacro()
+
+    # sfml-system
+    list(FIND SFML_FIND_COMPONENTS "system" FIND_SFML_SYSTEM_COMPONENT)
+    if(NOT ${FIND_SFML_SYSTEM_COMPONENT} EQUAL -1)
+
+        # update the list -- these are only system libraries, no need to find them
+        if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD OR FIND_SFML_OS_MACOSX)
+            set(SFML_SYSTEM_DEPENDENCIES "pthread")
+        endif()
+        if(FIND_SFML_OS_LINUX)
+            set(SFML_SYSTEM_DEPENDENCIES ${SFML_SYSTEM_DEPENDENCIES} "rt")
+        endif()
+        if(FIND_SFML_OS_WINDOWS)
+            set(SFML_SYSTEM_DEPENDENCIES "winmm")
+        endif()
+        set(SFML_DEPENDENCIES ${SFML_SYSTEM_DEPENDENCIES} ${SFML_DEPENDENCIES})
+    endif()
+
+    # sfml-network
+    list(FIND SFML_FIND_COMPONENTS "network" FIND_SFML_NETWORK_COMPONENT)
+    if(NOT ${FIND_SFML_NETWORK_COMPONENT} EQUAL -1)
+
+        # update the list -- these are only system libraries, no need to find them
+        if(FIND_SFML_OS_WINDOWS)
+            set(SFML_NETWORK_DEPENDENCIES "ws2_32")
+        endif()
+        set(SFML_DEPENDENCIES ${SFML_NETWORK_DEPENDENCIES} ${SFML_DEPENDENCIES})
+    endif()
+
+    # sfml-window
+    list(FIND SFML_FIND_COMPONENTS "window" FIND_SFML_WINDOW_COMPONENT)
+    if(NOT ${FIND_SFML_WINDOW_COMPONENT} EQUAL -1)
+
+        # find libraries
+        if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD)
+            find_sfml_dependency(X11_LIBRARY "X11" X11)
+            find_sfml_dependency(XRANDR_LIBRARY "Xrandr" Xrandr)
+        endif()
+
+        if(FIND_SFML_OS_LINUX)
+            find_sfml_dependency(UDEV_LIBRARIES "UDev" udev libudev)
+        endif()
+
+        # update the list
+        if(FIND_SFML_OS_WINDOWS)
+            set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "opengl32" "winmm" "gdi32")
+        elseif(FIND_SFML_OS_LINUX)
+            set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "GL" ${X11_LIBRARY} ${XRANDR_LIBRARY} ${UDEV_LIBRARIES})
+        elseif(FIND_SFML_OS_FREEBSD)
+            set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "GL" ${X11_LIBRARY} ${XRANDR_LIBRARY} "usbhid")
+        elseif(FIND_SFML_OS_MACOSX)
+            set(SFML_WINDOW_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} "-framework OpenGL -framework Foundation -framework AppKit -framework IOKit -framework Carbon")
+        endif()
+        set(SFML_DEPENDENCIES ${SFML_WINDOW_DEPENDENCIES} ${SFML_DEPENDENCIES})
+    endif()
+
+    # sfml-graphics
+    list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT)
+    if(NOT ${FIND_SFML_GRAPHICS_COMPONENT} EQUAL -1)
+
+        # find libraries
+        find_sfml_dependency(FREETYPE_LIBRARY "FreeType" freetype)
+        find_sfml_dependency(JPEG_LIBRARY "libjpeg" jpeg)
+
+        # update the list
+        set(SFML_GRAPHICS_DEPENDENCIES ${FREETYPE_LIBRARY} ${JPEG_LIBRARY})
+        set(SFML_DEPENDENCIES ${SFML_GRAPHICS_DEPENDENCIES} ${SFML_DEPENDENCIES})
+    endif()
+
+    # sfml-audio
+    list(FIND SFML_FIND_COMPONENTS "audio" FIND_SFML_AUDIO_COMPONENT)
+    if(NOT ${FIND_SFML_AUDIO_COMPONENT} EQUAL -1)
+
+        # find libraries
+        find_sfml_dependency(OPENAL_LIBRARY "OpenAL" openal openal32)
+        find_sfml_dependency(OGG_LIBRARY "Ogg" ogg)
+        find_sfml_dependency(VORBIS_LIBRARY "Vorbis" vorbis)
+        find_sfml_dependency(VORBISFILE_LIBRARY "VorbisFile" vorbisfile)
+        find_sfml_dependency(VORBISENC_LIBRARY "VorbisEnc" vorbisenc)
+        find_sfml_dependency(FLAC_LIBRARY "FLAC" FLAC)
+
+        # update the list
+        set(SFML_AUDIO_DEPENDENCIES ${OPENAL_LIBRARY} ${FLAC_LIBRARY} ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY})
+        set(SFML_DEPENDENCIES ${SFML_DEPENDENCIES} ${SFML_AUDIO_DEPENDENCIES})
+    endif()
+
+endif()
+
+# handle errors
+if(NOT SFML_VERSION_OK)
+    # SFML version not ok
+    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR}.${SFML_VERSION_PATCH})")
+    set(SFML_FOUND FALSE)
+elseif(SFML_STATIC_LIBRARIES AND FIND_SFML_DEPENDENCIES_NOTFOUND)
+    set(FIND_SFML_ERROR "SFML found but some of its dependencies are missing (${FIND_SFML_DEPENDENCIES_NOTFOUND})")
+    set(SFML_FOUND FALSE)
+elseif(NOT SFML_FOUND)
+    # include directory or library not found
+    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
+endif()
+if (NOT SFML_FOUND)
+    if(SFML_FIND_REQUIRED)
+        # fatal error
+        message(FATAL_ERROR ${FIND_SFML_ERROR})
+    elseif(NOT SFML_FIND_QUIETLY)
+        # error but continue
+        message("${FIND_SFML_ERROR}")
+    endif()
+endif()
+
+# handle success
+if(SFML_FOUND AND NOT SFML_FIND_QUIETLY)
+    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR}.${SFML_VERSION_PATCH} in ${SFML_INCLUDE_DIR}")
+endif()
--- a/cmake/MakeReleaseCommitAndTag.cmake
+++ b/cmake/MakeReleaseCommitAndTag.cmake
@@ -10,6 +10,10 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
    message(FATAL_ERROR "releases can only be done from a git clone")
 endif()

+if(NOT GIT_FOUND)
+    message(FATAL_ERROR "git is required to make a release")
+endif()
+
 find_program(GPG_EXECUTABLE gpg)

 if(NOT GPG_EXECUTABLE)
@@ -31,7 +35,7 @@ function(make_release_commit_and_tag)
    # First make sure we are on master.

    execute_process(
-        COMMAND git rev-parse --short --abbrev-ref=strict HEAD
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short --abbrev-ref=strict HEAD
        OUTPUT_VARIABLE git_branch
        OUTPUT_STRIP_TRAILING_WHITESPACE
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -42,7 +46,7 @@ function(make_release_commit_and_tag)
    endif()

    execute_process(
-        COMMAND git status --porcelain=2
+        COMMAND ${GIT_EXECUTABLE} status --porcelain=2
        OUTPUT_VARIABLE git_status
        OUTPUT_STRIP_TRAILING_WHITESPACE
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -55,7 +59,7 @@ function(make_release_commit_and_tag)
    endif()

    execute_process(
-        COMMAND git tag --sort=-v:refname
+        COMMAND ${GIT_EXECUTABLE} tag --sort=-v:refname
        OUTPUT_VARIABLE git_tags
        OUTPUT_STRIP_TRAILING_WHITESPACE
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -76,7 +80,7 @@ function(make_release_commit_and_tag)
    endif()

    execute_process(
-        COMMAND git log ${git_last_tag}.. "--pretty=format:* %h - %s [%aL]"
+        COMMAND ${GIT_EXECUTABLE} log ${git_last_tag}.. "--pretty=format:* %h - %s [%aL]"
        OUTPUT_VARIABLE release_log
        OUTPUT_STRIP_TRAILING_WHITESPACE
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -86,17 +90,17 @@ function(make_release_commit_and_tag)

    if(TAG_RELEASE STREQUAL UNDO)
        execute_process(
-            COMMAND git tag -d ${git_last_tag}
+            COMMAND ${GIT_EXECUTABLE} tag -d ${git_last_tag}
            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
        )

        execute_process(
-            COMMAND git reset HEAD~1
+            COMMAND ${GIT_EXECUTABLE} reset HEAD~1
            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
        )

        execute_process(
-            COMMAND git checkout HEAD CHANGELOG.md
+            COMMAND ${GIT_EXECUTABLE} checkout HEAD CHANGELOG.md
            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
        )

@@ -208,37 +212,45 @@ Ignore the following cmake error.
    )

    execute_process(
-        COMMAND git add CHANGELOG.md
+        COMMAND ${GIT_EXECUTABLE} add CHANGELOG.md
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
    )

-    message(FATAL_ERROR "
+    # Make the release commit.

-Release prepared.
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} commit -m "release ${new_tag}" --signoff -S
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )

-Edit CHANGELOG.md to remove any non-user-facing commits, and optionally add any
-release notes.
+    # Make release tag.

-Run the following commands to commit the change:
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} tag -s -m${new_tag} ${new_tag}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )

-    git commit -m'release ${new_tag}' --signoff -S
-    git tag -s -m'${new_tag}' ${new_tag}
+    message(FATAL_ERROR [=[
+
+Release commit and tag generated.
+
+**** IF YOU ARE SURE YOU WANT TO RELEASE ****
+
+Run the following commands to push the release commit and tag:
+
+    git push
+    git push --tags
+
+**** TO UNDO THE RELEASE ****

 To rollback these changes, run this command:

    cmake .. -DTAG_RELEASE=UNDO

-==== IF YOU ARE SURE YOU WANT TO RELEASE, THIS **CANNOT** BE REVERSED ====
-
-Run the following to push the release commit and tag:
-
-    git push
-    git push --tags
-
-Ignore the 'configuration incomplete' message following, this mode does not
+Ignore the "configuration incomplete" message following, this mode does not
 build anything.

-")
+]=])
 endfunction()

 make_release_commit_and_tag()
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -8,12 +8,7 @@ else()
    set(BUILD_DEFAULT ON)
 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_SDL "Build the SDL port" ${BUILD_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)
@@ -30,6 +25,7 @@ option(VBAM_STATIC "Try to link all libraries statically" ${VBAM_STATIC_DEFAULT}

 if(VBAM_STATIC)
    set(SDL2_STATIC ON)
+    set(SFML_STATIC_LIBRARIES ON)
    set(FFMPEG_STATIC ON)
    set(OPENAL_STATIC ON)
    set_property(GLOBAL PROPERTY LINK_SEARCH_START_STATIC ON)
@@ -67,9 +63,22 @@ endif()
 find_package(PkgConfig)

 # Link / SFML
-if(NOT TRANSLATIONS_ONLY)
+if(TRANSLATIONS_ONLY)
+    set(ENABLE_LINK_DEFAULT OFF)
+else()
+    find_package(SFML 2.4 COMPONENTS network system)
+    if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        if(SFML_STATIC_LIBRARIES AND SFML_NETWORK_LIBRARY_STATIC_DEBUG AND SFML_SYSTEM_LIBRARY_STATIC_DEBUG)
+            set(SFML_LIBRARIES ${SFML_NETWORK_LIBRARY_STATIC_DEBUG} ${SFML_SYSTEM_LIBRARY_STATIC_DEBUG})
+        elseif(SFML_NETWORK_LIBRARY_DYNAMIC_DEBUG AND SFML_SYSTEM_LIBRARY_DYNAMIC_DEBUG)
+            set(SFML_LIBRARIES ${SFML_NETWORK_LIBRARY_DYNAMIC_DEBUG} ${SFML_SYSTEM_LIBRARY_DYNAMIC_DEBUG})
+        endif()
+    endif()
+    set(ENABLE_LINK_DEFAULT OFF)
+    if(SFML_FOUND)
        set(ENABLE_LINK_DEFAULT ON)
    endif()
+endif()
 option(ENABLE_LINK "Enable GBA linking functionality" ${ENABLE_LINK_DEFAULT})

 # FFMpeg
@@ -77,7 +86,7 @@ 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)

-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})
@@ -137,7 +146,7 @@ set(ENABLE_FAUDIO_DEFAULT OFF)

 find_package(FAudio QUIET)

-if(FAudio_FOUND AND NOT (MINGW AND X86))
+if(FAudio_FOUND)
    set(ENABLE_FAUDIO_DEFAULT ON)
 endif()

@@ -153,5 +162,3 @@ endif()
 if(TRANSLATIONS_ONLY AND (ENABLE_SDL OR ENABLE_WX))
    message(FATAL_ERROR "The SDL and wxWidgets ports can't be built when TRANSLATIONS_ONLY is enabled")
 endif()
-
-option(GPG_SIGNATURES "Create GPG signatures for release files" OFF)
--- a/cmake/Set-Toolchain-vcpkg.cmake
+++ b/cmake/Set-Toolchain-vcpkg.cmake
@@ -10,28 +10,19 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET)
    # Check if we are in an MSVC environment.
    find_program(cl_exe_path NAME cl.exe HINTS ENV PATH)

-    if(ENV{CXX} MATCHES "cl.exe$" OR cl_exe_path)
+    if($ENV{CXX} MATCHES "cl.exe$" OR cl_exe_path)
        # Infer the architecture from the LIB folders.
-        foreach(lib $ENV{LIB})
-            if(lib MATCHES "x64$")
+        foreach(LIB $ENV{LIB})
+            if(${LIB} MATCHES "x64$")
                set(VBAM_VCPKG_PLATFORM "x64-windows-static")
                break()
            endif()
-            if(lib MATCHES "x86$")
+            if(${LIB} MATCHES "x86$")
                set(VBAM_VCPKG_PLATFORM "x86-windows-static")
                break()
            endif()
-            if(lib MATCHES "ARM64$")
+            if(${LIB} MATCHES "ARM64$")
                set(VBAM_VCPKG_PLATFORM "arm64-windows-static")
-
-                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_USE_HOST_TOOLS ON CACHE BOOL "Use vcpkg host tools" FORCE)
-                        break()
-                    endif()
-                endforeach()
-
                break()
            endif()
        endforeach()
@@ -60,28 +51,6 @@ if(NOT DEFINED VCPKG_TARGET_TRIPLET)
    message(STATUS "Inferred VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}")
 endif()

-function(vcpkg_seconds)
-    if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32))
-        execute_process(
-            COMMAND cmd /c echo %TIME:~0,8%
-            OUTPUT_VARIABLE time
-        )
-    else()
-        execute_process(
-            COMMAND date +%H:%M:%S
-            OUTPUT_VARIABLE time
-        )
-    endif()
-
-    string(SUBSTRING "${time}" 0 2 hours)
-    string(SUBSTRING "${time}" 3 2 minutes)
-    string(SUBSTRING "${time}" 6 2 secs)
-
-    math(EXPR seconds "(${hours} * 60 * 60) + (${minutes} * 60) + ${secs}")
-
-    set(seconds ${seconds} PARENT_SCOPE)
-endfunction()
-
 function(vcpkg_check_git_status git_status)
    # The VS vcpkg component cannot be written to without elevation.
    if(NOT git_status EQUAL 0 AND NOT VCPKG_ROOT MATCHES "Visual Studio")
@@ -502,7 +471,7 @@ function(vcpkg_set_toolchain)

        # Install core deps.
        execute_process(
-            COMMAND ${vcpkg_exe} --triplet ${VCPKG_TARGET_TRIPLET} install ${pkg}
+            COMMAND ${vcpkg_exe} install ${VCPKG_DEPS_QUALIFIED}
            WORKING_DIRECTORY ${VCPKG_ROOT}
        )

@@ -544,7 +513,7 @@ function(vcpkg_set_toolchain)
                set(dep_qualified "${dep}:${VCPKG_TARGET_TRIPLET}")

                execute_process(
-                    COMMAND --triplet ${VCPKG_TARGET_TRIPLET} ${vcpkg_exe} install ${dep}
+                    COMMAND ${vcpkg_exe} install ${dep_qualified}
                    WORKING_DIRECTORY ${VCPKG_ROOT}
                )

@@ -576,4 +545,14 @@ endfunction()

 vcpkg_set_toolchain()

+# Make vcpkg use debug libs for RelWithDebInfo
+set(orig_build_type ${CMAKE_BUILD_TYPE})
+
+if(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+    set(CMAKE_BUILD_TYPE Debug)
+endif()
+
 include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
+
+set(CMAKE_BUILD_TYPE ${orig_build_type})
+unset(orig_build_type)
--- a/cmake/Toolchain-gcc-clang.cmake
+++ b/cmake/Toolchain-gcc-clang.cmake
@@ -5,16 +5,10 @@ endif()
 if(UPSTREAM_RELEASE)
    if(X86_64)
        # Require and optimize for Core2 level support, tune for generic.
-        if(APPLE)
-            add_compile_options(-march=core2 -mtune=skylake)
-        else()
        add_compile_options(-march=core2 -mtune=generic)
-        endif()
    elseif(X86_32)
-        # Optimize for pentiumi3 and tune for generic for Windows XP builds.
-        set(WINXP TRUE)
-        add_compile_options(-march=pentium3 -mtune=generic)
-        add_compile_definitions(-DWINXP)
+        # Optimize for pentium-mmx and tune for generic for older builds.
+        add_compile_options(-march=pentium-mmx -mtune=generic)
    endif()
 endif()

@@ -52,9 +46,9 @@ if(NOT ENABLE_ASM) # inline asm is not allowed with -fPIC
 endif()

 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_compile_options(-ggdb3 -fno-omit-frame-pointer -Wall -Wextra)
+    add_compile_options(-ggdb3 -Og -fno-omit-frame-pointer -Wall -Wextra)
 else()
-    add_compile_options(-O3 -ffast-math -fomit-frame-pointer)
+    add_compile_options(-Ofast -fomit-frame-pointer)
 endif()

 # for some reason this is necessary
--- a/cmake/Toolchain-mingw.cmake
+++ b/cmake/Toolchain-mingw.cmake
@@ -3,8 +3,8 @@ if (NOT MINGW)
 endif()

 # this has to run after the toolchain is initialized.
-include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-include")
-include_directories("${CMAKE_SOURCE_DIR}/win32-deps/mingw-xaudio/include")
+include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include")
+include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")

 # Add Winsock as the last library linked because of broken link precedence.
 set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lws2_32")
--- a/cmake/Toolchain-msvc.cmake
+++ b/cmake/Toolchain-msvc.cmake
@@ -10,7 +10,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
    endif()
 endif()

-include_directories("${CMAKE_SOURCE_DIR}/win32-deps/msvc")
+include_directories("${CMAKE_SOURCE_DIR}/dependencies/msvc")

 add_compile_definitions(
    _FORCENAMELESSUNION
@@ -68,8 +68,6 @@ if(CMAKE_VERSION VERSION_LESS "3.25")
    endif()
 endif()

-add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++14>)
-
 set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "" FORCE)

 # We need to explicitly set all of these to override the CMake defaults.
--- a/cmake/UpdateAppcast.cmake
+++ b/cmake/UpdateAppcast.cmake
@@ -16,7 +16,7 @@ Ignore the following cmake error.
    # Get last tag.

    execute_process(
-        COMMAND git tag --sort=-v:refname
+        COMMAND ${GIT_EXECUTABLE} tag --sort=-v:refname
        OUTPUT_VARIABLE git_tags
        OUTPUT_STRIP_TRAILING_WHITESPACE
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -43,7 +43,7 @@ Ignore the following cmake error.
    # Clone repo.

    execute_process(
-        COMMAND git clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
+        COMMAND ${GIT_EXECUTABLE} clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    )

@@ -103,21 +103,21 @@ Ignore the following cmake error.
    )

    execute_process(
-        COMMAND git add appcast.xml
+        COMMAND ${GIT_EXECUTABLE} add appcast.xml
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
    )

    # Commit the change.

    execute_process(
-        COMMAND git commit -m "release ${new_tag}" --signoff -S
+        COMMAND ${GIT_EXECUTABLE} commit -m "release ${new_tag}" --signoff -S
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
    )

    # Make release tag.

    execute_process(
-        COMMAND git tag -s -m${new_tag} ${new_tag}
+        COMMAND ${GIT_EXECUTABLE} tag -s -m${new_tag} ${new_tag}
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
    )

--- a/cmake/doctest.cmake
+++ b/cmake/doctest.cmake
@@ -0,0 +1,175 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+doctest
+-----
+
+This module defines a function to help use the doctest test framework.
+
+The :command:`doctest_discover_tests` discovers tests by asking the compiled test
+executable to enumerate its tests.  This does not require CMake to be re-run
+when tests change.  However, it may not work in a cross-compiling environment,
+and setting test properties is less convenient.
+
+This command is intended to replace use of :command:`add_test` to register
+tests, and will create a separate CTest test for each doctest test case.  Note
+that this is in some cases less efficient, as common set-up and tear-down logic
+cannot be shared by multiple test cases executing in the same instance.
+However, it provides more fine-grained pass/fail information to CTest, which is
+usually considered as more beneficial.  By default, the CTest test name is the
+same as the doctest name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
+
+.. command:: doctest_discover_tests
+
+  Automatically add tests with CTest by querying the compiled test executable
+  for available tests::
+
+    doctest_discover_tests(target
+                         [TEST_SPEC arg1...]
+                         [EXTRA_ARGS arg1...]
+                         [WORKING_DIRECTORY dir]
+                         [TEST_PREFIX prefix]
+                         [TEST_SUFFIX suffix]
+                         [PROPERTIES name1 value1...]
+                         [TEST_LIST var]
+    )
+
+  ``doctest_discover_tests`` sets up a post-build command on the test executable
+  that generates the list of tests by parsing the output from running the test
+  with the ``--list-test-cases`` argument.  This ensures that the full
+  list of tests is obtained.  Since test discovery occurs at build time, it is
+  not necessary to re-run CMake when the list of tests changes.
+  However, it requires that :prop_tgt:`CROSSCOMPILING_EMULATOR` is properly set
+  in order to function in a cross-compiling environment.
+
+  Additionally, setting properties on tests is somewhat less convenient, since
+  the tests are not available at CMake time.  Additional test properties may be
+  assigned to the set of tests as a whole using the ``PROPERTIES`` option.  If
+  more fine-grained test control is needed, custom content may be provided
+  through an external CTest script using the :prop_dir:`TEST_INCLUDE_FILES`
+  directory property.  The set of discovered tests is made accessible to such a
+  script via the ``<target>_TESTS`` variable.
+
+  The options are:
+
+  ``target``
+    Specifies the doctest executable, which must be a known CMake executable
+    target.  CMake will substitute the location of the built executable when
+    running the test.
+
+  ``TEST_SPEC arg1...``
+    Specifies test cases, wildcarded test cases, tags and tag expressions to
+    pass to the doctest executable with the ``--list-test-cases`` argument.
+
+  ``EXTRA_ARGS arg1...``
+    Any extra arguments to pass on the command line to each test case.
+
+  ``WORKING_DIRECTORY dir``
+    Specifies the directory in which to run the discovered test cases.  If this
+    option is not provided, the current binary directory is used.
+
+  ``TEST_PREFIX prefix``
+    Specifies a ``prefix`` to be prepended to the name of each discovered test
+    case.  This can be useful when the same test executable is being used in
+    multiple calls to ``doctest_discover_tests()`` but with different
+    ``TEST_SPEC`` or ``EXTRA_ARGS``.
+
+  ``TEST_SUFFIX suffix``
+    Similar to ``TEST_PREFIX`` except the ``suffix`` is appended to the name of
+    every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
+    be specified.
+
+  ``PROPERTIES name1 value1...``
+    Specifies additional properties to be set on all tests discovered by this
+    invocation of ``doctest_discover_tests``.
+
+  ``TEST_LIST var``
+    Make the list of tests available in the variable ``var``, rather than the
+    default ``<target>_TESTS``.  This can be useful when the same test
+    executable is being used in multiple calls to ``doctest_discover_tests()``.
+    Note that this variable is only available in CTest.
+
+#]=======================================================================]
+
+#------------------------------------------------------------------------------
+function(doctest_discover_tests TARGET)
+  cmake_parse_arguments(
+    ""
+    ""
+    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST"
+    "TEST_SPEC;EXTRA_ARGS;PROPERTIES"
+    ${ARGN}
+  )
+
+  if(NOT _WORKING_DIRECTORY)
+    set(_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+  endif()
+  if(NOT _TEST_LIST)
+    set(_TEST_LIST ${TARGET}_TESTS)
+  endif()
+
+  ## Generate a unique name based on the extra arguments
+  string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS}")
+  string(SUBSTRING ${args_hash} 0 7 args_hash)
+
+  # Define rule to generate test list for aforementioned test executable
+  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
+  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
+  get_property(crosscompiling_emulator
+    TARGET ${TARGET}
+    PROPERTY CROSSCOMPILING_EMULATOR
+  )
+  add_custom_command(
+    TARGET ${TARGET} POST_BUILD
+    BYPRODUCTS "${ctest_tests_file}"
+    COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_TARGET=${TARGET}"
+            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
+            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
+            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
+            -D "TEST_SPEC=${_TEST_SPEC}"
+            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
+            -D "TEST_PROPERTIES=${_PROPERTIES}"
+            -D "TEST_PREFIX=${_TEST_PREFIX}"
+            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+            -D "TEST_LIST=${_TEST_LIST}"
+            -D "CTEST_FILE=${ctest_tests_file}"
+            -P "${_DOCTEST_DISCOVER_TESTS_SCRIPT}"
+    VERBATIM
+  )
+
+  file(WRITE "${ctest_include_file}"
+    "if(EXISTS \"${ctest_tests_file}\")\n"
+    "  include(\"${ctest_tests_file}\")\n"
+    "else()\n"
+    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
+    "endif()\n"
+  )
+
+  if(NOT CMAKE_VERSION VERSION_LESS 3.10)
+    # Add discovered tests to directory TEST_INCLUDE_FILES
+    set_property(DIRECTORY
+      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
+    )
+  else()
+    # Add discovered tests as directory TEST_INCLUDE_FILE if possible
+    get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET)
+    if(NOT ${test_include_file_set})
+      set_property(DIRECTORY
+        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
+      )
+    else()
+      message(FATAL_ERROR
+        "Cannot set more than one TEST_INCLUDE_FILE"
+      )
+    endif()
+  endif()
+
+endfunction()
+
+###############################################################################
+
+set(_DOCTEST_DISCOVER_TESTS_SCRIPT
+  ${CMAKE_CURRENT_LIST_DIR}/doctestAddTests.cmake
+)
--- a/cmake/doctestAddTests.cmake
+++ b/cmake/doctestAddTests.cmake
@@ -0,0 +1,81 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+set(prefix "${TEST_PREFIX}")
+set(suffix "${TEST_SUFFIX}")
+set(spec ${TEST_SPEC})
+set(extra_args ${TEST_EXTRA_ARGS})
+set(properties ${TEST_PROPERTIES})
+set(script)
+set(suite)
+set(tests)
+
+function(add_command NAME)
+  set(_args "")
+  foreach(_arg ${ARGN})
+    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
+      set(_args "${_args} [==[${_arg}]==]") # form a bracket_argument
+    else()
+      set(_args "${_args} ${_arg}")
+    endif()
+  endforeach()
+  set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
+endfunction()
+
+# Run test executable to get list of available tests
+if(NOT EXISTS "${TEST_EXECUTABLE}")
+  message(FATAL_ERROR
+    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
+  )
+endif()
+
+if("${spec}" MATCHES .)
+  set(spec "--test-case=${spec}")
+endif()
+
+execute_process(
+  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-cases
+  OUTPUT_VARIABLE output
+  RESULT_VARIABLE result
+)
+if(NOT ${result} EQUAL 0)
+  message(FATAL_ERROR
+    "Error running test executable '${TEST_EXECUTABLE}':\n"
+    "  Result: ${result}\n"
+    "  Output: ${output}\n"
+  )
+endif()
+
+string(REPLACE "\n" ";" output "${output}")
+
+# Parse output
+foreach(line ${output})
+  if("${line}" STREQUAL "===============================================================================" OR "${line}" MATCHES [==[^\[doctest\] ]==])
+    continue()
+  endif()
+  set(test ${line})
+  # use escape commas to handle properly test cases with commas inside the name
+  string(REPLACE "," "\\," test_name ${test})
+  # ...and add to script
+  add_command(add_test
+    "${prefix}${test}${suffix}"
+    ${TEST_EXECUTOR}
+    "${TEST_EXECUTABLE}"
+    "--test-case=${test_name}"
+    ${extra_args}
+  )
+  add_command(set_tests_properties
+    "${prefix}${test}${suffix}"
+    PROPERTIES
+    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+    ${properties}
+  )
+  list(APPEND tests "${prefix}${test}${suffix}")
+endforeach()
+
+# Create a list of all discovered tests, which users may use to e.g. set
+# properties on the tests
+add_command(set ${TEST_LIST} ${tests})
+
+# Write CTest script
+file(WRITE "${CTEST_FILE}" "${script}")
--- a/default.nix
+++ b/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 gcc nasm faudio gettext libintl pkg-config zip sfml 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 ]
    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 nasm faudio gettext libintl pkg-config zip sfml zlib openal ffmpeg wxGTK32 libGL libGLU glfw SDL2 gtk3-x11 pcre pcre2 util-linuxMinimal libselinux libsepol libthai libdatrie xorg.libXdmcp xorg.libXtst libxkbcommon epoxy dbus at-spi2-core ];
 }
--- a/1
+++ b/1
--- a/56
+++ b/56
@@ -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 sdl2 sfml wx31-gtk3 iconv zip ninja"

    [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"

@@ -318,6 +318,12 @@ debian_installdeps() {
    if [ -z "$target" ]; then
        sudo apt-get -qq -y update

+        sfml_libs=
+
+        for lib in graphics window network; do
+            sfml_libs="$sfml_libs $(apt-cache search "libsfml-$lib" | sed 's/ - .*//' | sort -r | head -1)"
+        done
+
        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)
@@ -344,7 +350,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 libsdl2-dev $sdl_lib libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev libsfml-dev $sfml_libs $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 +401,7 @@ debian_installdeps() {
            fi
        fi

-        deps="gcc zlib ffmpeg gettext sdl2 openal wxwidgets openal"
+        deps="gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets openal"
        [ -n "$ENABLE_FFMPEG" ] && deps="$deps ffmpeg"

        set --
@@ -492,7 +498,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 SDL2-devel SFML-devel openal-soft-devel wxGTK-devel gtk3-devel; do
            case $pkg in
                *ffmpeg*)
                    [ -z "$ENABLE_FFMPEG" ] && continue
@@ -591,6 +597,8 @@ fedora_installdeps() {

        # get the necessary win32 headers
        git submodule update --init --remote --recursive
+
+        warning='SFML is required for LINK support, Fedora does not currently have a MinGW SFML package, if you want LINK support you will need to install it manually'
    fi

    [ -z "$rpms_installed" ] && check sudo dnf -y --nogpgcheck --best --allowerasing install "$@"
@@ -676,6 +684,8 @@ rhel_installdeps() {
            set -- --exclude='glibc32*'
        fi

+        warning='RHEL does not currently have SFML packages, LINK support will be disabled'
+
        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
            case $pkg in
                *ffmpeg*)
@@ -767,6 +777,8 @@ rhel_installdeps() {

        # get the necessary win32 headers
        git submodule update --init --remote --recursive
+
+        warning='SFML is required for LINK support, RHEL/EPEL does not currently have a MinGW SFML package, if you want LINK support you will need to install it manually'
    fi

    [ -z "$rpms_installed" ] && check sudo yum -y install "$@"
@@ -785,12 +797,14 @@ suse_installdeps() {
    check_cross
    installing

-    tools="make cmake ccache nasm gettext-tools pkg-config ccache zip ninja"
+    tools="make cmake ccache nasm gettext-tools pkg-config ccache zip sfml2-devel 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++ libSDL2-devel wxWidgets-3_0-devel openal-soft-devel" # ffmpeg-devel
+
+    # ffmpeg requires packman repos

    if [ "$target" = m32 ]; then
-        error '32 bit cross builds are no longer supported on OpenSUSE'
+        libs=$(echo "$libs" | sed -E 's/([^ ]) ([^ ])/\1-32bit \2/g; s/$/-32bit/;')
    fi

    check sudo zypper in -y $tools $libs
@@ -854,7 +868,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 sdl2 wxgtk3 $gtk sfml openal"

    [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg"

@@ -870,7 +884,7 @@ archlinux_installdeps() {
        else
            # try to build 32 bit binaries

-            # lib32-ffmpeg is in AUR
+            # lib32-sfml and lib32-ffmpeg are in AUR
            archlinux_require_yaourt

            # enable multilib repos if not enabled
@@ -964,6 +978,8 @@ EOF

        # get the necessary win32 headers
        git submodule update --init --remote --recursive
+
+        warning 'SFML is required for LINK support, the SFML package in AUR is currently broken, if you want LINK support you will need to install it manually'
    fi

    build_instructions
@@ -1026,12 +1042,13 @@ solus_installdeps() {
        done
    else
        # no 32bit versions of these
-        set -- "$@" ffmpeg-devel
+        set -- "$@" SFML-devel ffmpeg-devel
    fi

    check sudo eopkg -y install "$@"

    if [ -n "$amd64" -a "$target" = m32 ]; then
+        warning 'SFML is required for LINK support, there is no 32 bit SFML package in Solus currently, if you want LINK support you will need to install it manually'
        warning 'ffmpeg is required for game recording, there is no 32 bit ffmpeg package in Solus currently, you may wish to install it manually'
    fi

@@ -1053,6 +1070,7 @@ gentoo_installdeps() {
      dev-util/ccache \
      sys-devel/binutils \
      media-libs/libsdl2 \
+      media-libs/libsfml \
      media-libs/openal \
      x11-libs/wxGTK:$wx_slot \
      sys-libs/zlib \
@@ -1070,7 +1088,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 sdl2-dev glu-dev sfml-dev wxwidgets-dev gtk+3.0-dev zip

    build_instructions
 }
@@ -1100,12 +1118,9 @@ windows_installdeps() {
        *i686*)
            pkgs="$pkgs nasm"
            ;;
-        *)
-            pkgs="$pkgs FAudio"
-            ;;
    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 SDL2 sfml FAudio 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,10 +1192,15 @@ 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 pkg-config sdl2 wxwidgets faudio ccache ninja zlib"

    [ -n "$ENABLE_FFMPEG" ] && brews="$brews ffmpeg"

+    # sfml brew currently broken in the travis mac environment
+#    if [ -z "$TRAVIS" ]; then
+        brews="$brews sfml"
+#    fi
+
    # This is necessary for the GitHub Actions CI:
    brew -v install python
    brew link --overwrite python
@@ -1203,7 +1223,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 libsdl2 sfml wxWidgets-3.0 libiconv ninja"

    [ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg"

@@ -1219,7 +1239,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 sdl2 wxwidgets300-osxcocoa libiconv-dev sfml24-dev ccache ninja"

    [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"

--- a/po/wxvbam/bg.po
+++ b/po/wxvbam/bg.po
--- a/po/wxvbam/br.po
+++ b/po/wxvbam/br.po
--- a/po/wxvbam/cs.po
+++ b/po/wxvbam/cs.po
--- a/po/wxvbam/de.po
+++ b/po/wxvbam/de.po
--- a/po/wxvbam/el.po
+++ b/po/wxvbam/el.po
--- a/po/wxvbam/es.po
+++ b/po/wxvbam/es.po
--- a/po/wxvbam/es_419.po
+++ b/po/wxvbam/es_419.po
--- a/po/wxvbam/fr_FR.po
+++ b/po/wxvbam/fr_FR.po
--- a/po/wxvbam/gl.po
+++ b/po/wxvbam/gl.po
--- a/po/wxvbam/he_IL.po
+++ b/po/wxvbam/he_IL.po
--- a/po/wxvbam/hu_HU.po
+++ b/po/wxvbam/hu_HU.po
--- a/po/wxvbam/id.po
+++ b/po/wxvbam/id.po
--- a/po/wxvbam/it_IT.po
+++ b/po/wxvbam/it_IT.po
--- a/po/wxvbam/ja.po
+++ b/po/wxvbam/ja.po
--- a/po/wxvbam/ja_JP.po
+++ b/po/wxvbam/ja_JP.po
--- a/po/wxvbam/ko_KR.po
+++ b/po/wxvbam/ko_KR.po
--- a/po/wxvbam/ms_MY.po
+++ b/po/wxvbam/ms_MY.po
--- a/po/wxvbam/nb.po
+++ b/po/wxvbam/nb.po
--- a/po/wxvbam/nl.po
+++ b/po/wxvbam/nl.po
--- a/po/wxvbam/pl_PL.po
+++ b/po/wxvbam/pl_PL.po
--- a/po/wxvbam/pt_BR.po
+++ b/po/wxvbam/pt_BR.po
--- a/po/wxvbam/pt_PT.po
+++ b/po/wxvbam/pt_PT.po
--- a/po/wxvbam/ru_RU.po
+++ b/po/wxvbam/ru_RU.po
--- a/po/wxvbam/sv.po
+++ b/po/wxvbam/sv.po
--- a/po/wxvbam/tr.po
+++ b/po/wxvbam/tr.po
--- a/po/wxvbam/uk.po
+++ b/po/wxvbam/uk.po
--- a/po/wxvbam/ur_PK.po
+++ b/po/wxvbam/ur_PK.po
--- a/po/wxvbam/wxvbam.pot
+++ b/po/wxvbam/wxvbam.pot
--- a/po/wxvbam/zh-Hans.po
+++ b/po/wxvbam/zh-Hans.po
--- a/po/wxvbam/zh.po
+++ b/po/wxvbam/zh.po
--- a/po/wxvbam/zh_CN.po
+++ b/po/wxvbam/zh_CN.po
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,6 +19,8 @@ parts:
    cmake-generator: Ninja
    stage-packages:
      - libsdl2-2.0-0
+      - libsfml-network2.5
+      - libsfml-system2.5
      - libnotify4
      - libsm6
      - libopenal1
@@ -44,6 +46,7 @@ parts:
      - zip
      - libnotify-dev
      - libsdl2-dev
+      - libsfml-dev
      - libgtk-3-dev
      - libopenal-dev
      - libwxgtk3.0-gtk3-dev
--- a/src/components/filters/CMakeLists.txt
+++ b/src/components/filters/CMakeLists.txt
@@ -1,13 +1,5 @@
 add_library(vbam-components-filters OBJECT)

-unset(extra_src)
-if(WINXP)
-    list(APPEND extra_src
-        ${CMAKE_SOURCE_DIR}/third_party/quake3-sqrt/quake3-sqrt.h
-    )
-    target_include_directories(vbam-components-filters PRIVATE ${CMAKE_SOURCE_DIR}/third_party/quake3-sqrt)
-endif()
-
 target_sources(vbam-components-filters
    PRIVATE
    internal/2xSaI.cpp
@@ -25,7 +17,6 @@ target_sources(vbam-components-filters
    internal/xBRZ/xbrz_config.h
    internal/xBRZ/xbrz_tools.h
    internal/xbrzfilter.cpp
-    ${extra_src}

    PUBLIC
    filters.h
--- a/src/components/filters/internal/xBRZ/xbrz.cpp
+++ b/src/components/filters/internal/xBRZ/xbrz.cpp
@@ -21,10 +21,6 @@
 #include <cmath> //std::sqrt
 #include "xbrz_tools.h"

-#ifdef WINXP
-#include "quake3-sqrt.h"
-#endif
-
 // some gcc versions lie about having this C++17 feature
 #define static_assert(x) static_assert(x, "assertion failed")

@@ -70,9 +66,7 @@ uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate c

 inline double fastSqrt(double n)
 {
-#ifdef WINXP
-    return quake3_sqrt((float)n);
-#elif (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
+#if (defined(__GNUC__) || defined(__clang__)) && (defined(__x86_64__) || defined(__i386__))
    __asm__ ("fsqrt" : "+t" (n));
    return n;
 #elif defined(_MSC_VER) && defined(_M_IX86)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -136,5 +136,3 @@ if(ENABLE_LINK)
        PRIVATE ${NLS_LIBS}
    )
 endif()
-
-add_subdirectory(test)
--- a/src/core/base/CMakeLists.txt
+++ b/src/core/base/CMakeLists.txt
@@ -5,9 +5,7 @@
 # Generate version_gen.h
 string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1,\\2,\\3,0" VBAM_WIN_VERSION "${VBAM_VERSION}")
 set(VBAM_GENERATED_VERSION_H ${VBAM_GENERATED_DIR}/core/base/version_gen.h)
-add_custom_command(
-    OUTPUT
-        ${VBAM_GENERATED_VERSION_H}
+add_custom_target(vbam-core-base-generated
    COMMAND ${CMAKE_COMMAND}
        -DVBAM_GENERATED_VERSION_H=${VBAM_GENERATED_VERSION_H}
        -DVBAM_VERSION=${VBAM_VERSION}
@@ -15,6 +13,8 @@ add_custom_command(
        -DVBAM_VERSION_RELEASE=${VBAM_VERSION_RELEASE}
        -DVBAM_WIN_VERSION=${VBAM_WIN_VERSION}
        -P ${CMAKE_CURRENT_SOURCE_DIR}/build-version.cmake
+    BYPRODUCTS
+        ${VBAM_GENERATED_VERSION_H}
    DEPENDS
        version_gen.h.in
        build-version.cmake
@@ -22,6 +22,8 @@ add_custom_command(

 add_library(vbam-core-base OBJECT)

+add_dependencies(vbam-core-base vbam-core-base-generated)
+
 target_sources(vbam-core-base
    PRIVATE
    file_util_common.cpp
@@ -35,7 +37,6 @@ target_sources(vbam-core-base
    version.cpp

    PUBLIC
-    check.h
    array.h
    file_util.h
    image_util.h
@@ -47,8 +48,6 @@ target_sources(vbam-core-base
    sound_driver.h
    system.h
    version.h
-    # Generated file.
-    ${VBAM_GENERATED_VERSION_H}
 )

 target_include_directories(vbam-core-base
@@ -60,5 +59,3 @@ target_link_libraries(vbam-core-base
    PRIVATE vbam-fex stb-image
    PUBLIC ${ZLIB_LIBRARY}
 )
-
-add_subdirectory(test)
--- a/src/core/base/check.h
+++ b/src/core/base/check.h
@@ -1,58 +0,0 @@
-#ifndef VBAM_CORE_BASE_CHECK_H_
-#define VBAM_CORE_BASE_CHECK_H_
-
-// This header defines a number of macros for checking conditions and crashing
-// the program if they are not met.
-// * VBAM_CHECK(condition) - crashes the program if the condition is not met.
-// * VBAM_NOTREACHED() - crashes the program if this line of code is reached.
-//   In release builds, this macro also tells the compiler that this code path
-//   is unreachable, which can help the compiler generate better code.
-// * VBAM_STRINGIFY(x) - converts the argument to a string literal.
-// While a number of other macros are defined in this file, they are not
-// intended for general use and should be avoided.
-
-#if defined(__GNUC__) || defined(__clang__)
-
-// GCC/Clang.
-#define VBAM_IMMEDIATE_CRASH_DETAIL() __builtin_trap()
-#define VBAM_INTRINSIC_UNREACHABLE_DETAIL() __builtin_unreachable()
-
-#elif defined(_MSC_VER)  // defined(__GNUC__) || defined(__clang__)
-
-// MSVC.
-#define VBAM_IMMEDIATE_CRASH_DETAIL() __debugbreak()
-#define VBAM_INTRINSIC_UNREACHABLE_DETAIL() __assume(0)
-
-#else  // defined(__GNUC__) || defined(__clang__)
-
-#error "Unsupported compiler"
-
-#endif  // defined(__GNUC__) || defined(__clang__)
-
-#define VBAM_STRINGIFY_DETAIL(x) #x
-#define VBAM_STRINGIFY(x) VBAM_STRINGIFY_DETAIL(x)
-
-#define VBAM_REQUIRE_SEMICOLON_DETAIL() \
-    static_assert(true, "Require a semicolon after macros invocation.")
-
-#define VBAM_CHECK(condition)                                                                \
-    if (!(condition)) {                                                                      \
-        fputs("CHECK failed at " __FILE__ ":" VBAM_STRINGIFY(__LINE__) ": " #condition "\n", \
-              stderr);                                                                       \
-        VBAM_IMMEDIATE_CRASH_DETAIL();                                                       \
-    }                                                                                        \
-    VBAM_REQUIRE_SEMICOLON_DETAIL()
-
-#if defined(DEBUG)
-
-#define VBAM_NOTREACHED()                                                                    \
-    fputs("NOTREACHED code reached at " __FILE__ ":" VBAM_STRINGIFY(__LINE__) "\n", stderr); \
-    VBAM_IMMEDIATE_CRASH_DETAIL()
-
-#else  // defined(DEBUG)
-
-#define VBAM_NOTREACHED() VBAM_INTRINSIC_UNREACHABLE_DETAIL()
-
-#endif  // defined(DEBUG)
-
-#endif  // VBAM_CORE_BASE_CHECK_H_
--- a/src/core/base/system.h
+++ b/src/core/base/system.h
@@ -59,7 +59,6 @@ extern struct CoreOptions {
    bool speedHack = false;
    bool speedup = false;
    bool speedup_throttle_frame_skip = false;
-    bool speedup_mute = true;
    int cheatsEnabled = 1;
    int cpuDisableSfx = 0;
    int cpuSaveType = 0;
@@ -70,7 +69,7 @@ extern struct CoreOptions {
    int skipSaveGameBattery = 1;
    int skipSaveGameCheats = 0;
    int useBios = 0;
-    int gbPrinterEnabled = 0;
+    int winGbPrinterEnabled = 1;
    uint32_t speedup_throttle = 100;
    uint32_t speedup_frame_skip = 9;
    uint32_t throttle = 100;
--- a/src/core/base/test/CMakeLists.txt
+++ b/src/core/base/test/CMakeLists.txt
@@ -1,12 +0,0 @@
-# This defines the `vbam-core-base-test` library.
-
-if(NOT BUILD_TESTING)
-    return()
-endif()
-
-add_library(vbam-core-base-test
-    INTERFACE
-    notreached.h)
-
-target_link_libraries(vbam-core-base-test
-    INTERFACE GTest::gtest)
--- a/src/core/base/test/notreached.h
+++ b/src/core/base/test/notreached.h
@@ -1,22 +0,0 @@
-#ifndef VBAM_CORE_BASE_TEST_NOTREACHED_H_
-#define VBAM_CORE_BASE_TEST_NOTREACHED_H_
-
-#include <gtest/gtest.h>
-
-#if defined(DEBUG)
-
-#define VBAM_EXPECT_NOTREACHED(statement) EXPECT_DEATH(statement, "NOTREACHED")
-
-#else  // defined(DEBUG)
-
-// There is no way to test this in release builds as the compiler might optimize
-// this code path away. Eat the statement to avoid unused variable warnings.
-#define VBAM_EXPECT_NOTREACHED(statement) \
-    if constexpr (false) { \
-        statement; \
-    } \
-    static_assert(true, "")
-
-#endif  // defined(DEBUG)
-
-#endif  // VBAM_CORE_BASE_TEST_NOTREACHED_H_
--- a/src/core/base/version.cpp
+++ b/src/core/base/version.cpp
@@ -1,7 +1,4 @@
 #include "core/base/version.h"

-#include "core/base/version_gen.h"
-
-const std::string kVbamMainVersion = VBAM_CURRENT_VERSION;
 const std::string kVbamNameAndSubversion = VBAM_NAME_AND_SUBVERSION;
 const std::string kVbamVersion = VBAM_VERSION;
--- a/src/core/base/version.h
+++ b/src/core/base/version.h
@@ -3,9 +3,7 @@

 #include <string>

-// Main version information, generated by the build system.
-// e.g. "2.1.9"
-extern const std::string kVbamMainVersion;
+#include "core/base/version_gen.h"

 // Full version information, generated by the build system.
 // e.g. "VisualBoyAdvance-M 2.1.9-316e4a43 msvc-316e4a43"
--- a/src/core/gb/gb.cpp
+++ b/src/core/gb/gb.cpp
@@ -1,13 +1,13 @@
 #include "core/gb/gb.h"

 #include <array>
+#include <cassert>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <vector>

-#include "core/base/check.h"
 #include "core/base/file_util.h"
 #include "core/base/message.h"
 #include "core/base/sizes.h"
@@ -291,7 +291,8 @@ bool gbInitializeRom(size_t romSize) {
        switch (g_gbCartData.validity()) {
            case gbCartData::Validity::kValid:
            case gbCartData::Validity::kUninitialized:
-                VBAM_NOTREACHED();
+                // Unreachable.
+                assert(false);
                break;
            case gbCartData::Validity::kSizeTooSmall:
                systemMessage(MSG_UNSUPPORTED_ROM_SIZE,
@@ -1416,7 +1417,7 @@ void gbWriteMemory(uint16_t address, uint8_t value)
        EmuReseted = false;
        gbMemory[0xff02] = value;
        if (gbSerialOn && (GetLinkMode() == LINK_GAMEBOY_IPC || GetLinkMode() == LINK_GAMEBOY_SOCKET
-        || GetLinkMode() == LINK_DISCONNECTED || coreOptions.gbPrinterEnabled)) {
+        || GetLinkMode() == LINK_DISCONNECTED || coreOptions.winGbPrinterEnabled)) {

            gbSerialTicks = GBSERIAL_CLOCK_TICKS;

@@ -2969,13 +2970,8 @@ void gbReset()
        inBios = true;
    } else if (gbHardware & 0xa) {
        // Set compatibility mode if it is a DMG ROM.
-        if (g_gbCartData.SupportsCGB()) {
-            // OPRI with bit 0 set to 0 = CGB mode.
-            gbMemory[0xff6c] = 0xfe;
-        } else {
-            // OPRI with bit 0 set to 1 = DMG mode.
-            gbMemory[0xff6c] = 0xff;
-        }
+        const uint8_t gbcFlag = g_gbCartData.SupportsCGB() ? 0x80 : 0x00;
+        gbMemory[0xff6c] = 0xfe | gbcFlag;
    }

    gbLine99Ticks = 1;
--- a/src/core/gb/gbCartData.cpp
+++ b/src/core/gb/gbCartData.cpp
@@ -2,8 +2,8 @@

 #include <algorithm>
 #include <array>
+#include <cassert>

-#include "core/base/check.h"
 #include "core/base/sizes.h"

 namespace {
@@ -62,7 +62,7 @@ char byte_to_char(uint8_t byte) {
    } else if (byte < 16) {
        return 'A' + (byte - 10);
    } else {
-        VBAM_NOTREACHED();
+        assert(false);
        return '\0';
    }
 }
@@ -98,7 +98,7 @@ bool is_valid_manufacturer_code(const std::string& manufacturer_code) {
 constexpr size_t kHeaderGlobalChecksumAdress = 0x14e;

 uint16_t get_rom_checksum(const uint8_t* romData, size_t romDataSize) {
-    VBAM_CHECK(romData);
+    assert(romData);

    uint16_t checksum = 0;
    for (size_t i = 0; i < romDataSize; i++) {
@@ -160,7 +160,7 @@ constexpr size_t kHeaderChecksumEndAdress = 0x14c;
 }  // namespace

 gbCartData::gbCartData(const uint8_t* romData, size_t romDataSize) {
-    VBAM_CHECK(romData);
+    assert(romData);

    if (romDataSize < sizeof(gbRomHeader)) {
        validity_ = Validity::kSizeTooSmall;
--- a/src/core/gba/gba.cpp
+++ b/src/core/gba/gba.cpp
@@ -481,7 +481,7 @@ void gbaUpdateRomSize(int size)
    if (size > romSize) {
        romSize = size;

-        uint8_t* tmp = (uint8_t*)realloc(g_rom, romSize);
+        uint8_t* tmp = (uint8_t*)realloc(g_rom, SIZE_ROM);
        g_rom = tmp;

        uint16_t* temp = (uint16_t*)(g_rom + ((romSize + 1) & ~1));
@@ -3845,8 +3845,6 @@ void CPULoop(int ticks)
                    bool turbo_button_pressed        = (joy >> 10) & 1;
 #ifndef __LIBRETRO__
                    static uint32_t last_throttle;
-                    static bool current_volume_saved = false;
-                    static float current_volume;

                    if (turbo_button_pressed) {
                        if (coreOptions.speedup_frame_skip)
@@ -3861,24 +3859,11 @@ void CPULoop(int ticks)
                            if (coreOptions.speedup_throttle_frame_skip)
                                framesToSkip += static_cast<int>(std::ceil(double(coreOptions.speedup_throttle) / 100.0) - 1);
                        }
-
-                        if (coreOptions.speedup_mute && !current_volume_saved) {
-                            current_volume = soundGetVolume();
-                            current_volume_saved = true;
-                            soundSetVolume(0);
                    }
-                    }
-                    else {
-                        if (current_volume_saved) {
-                            soundSetVolume(current_volume);
-                            current_volume_saved = false;
-                        }
-
-                        if (speedup_throttle_set) {
+                    else if (speedup_throttle_set) {
                        soundSetThrottle(DowncastU16(last_throttle));
                        speedup_throttle_set = false;
                    }
-                    }
 #else
                    if (turbo_button_pressed)
                        framesToSkip = 9;
--- a/src/core/gba/gbaCpuThumb.cpp
+++ b/src/core/gba/gbaCpuThumb.cpp
@@ -1822,16 +1822,6 @@ static INSN_REGPARM void thumbE0(uint32_t opcode)
    busPrefetchCount = 0;
 }

-static INSN_REGPARM void thumbE8(uint32_t opcode)
-{
-#ifdef GBA_LOGGING
-    // TODO: This is (erroneously) used by some Wii U VC ROMs. We should have a configuration
-    // toggle to enable the correct hardware behavior, which would be to call CPUUndefinedException.
-    if (systemVerbose & VERBOSE_UNDEFINED)
-        log("Undefined Wii U THUMB instruction %04x at %08x (ignored)\n", opcode, armNextPC - 2);
-#endif
-}
-
 // BLL #offset (forward)
 static INSN_REGPARM void thumbF0(uint32_t opcode)
 {
@@ -1989,7 +1979,7 @@ static insnfunc_t thumbInsnTable[1024] = {
    thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0,
    thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0,
    thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0, thumbE0,
-    thumbE8, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, // E8
+    thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, // E8
    thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI,
    thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI,
    thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI, thumbUI,
--- a/src/core/gba/gbaLink.cpp
+++ b/src/core/gba/gbaLink.cpp
@@ -26,7 +26,7 @@
 #include <cstring>
 #include <string>

-#include "SFML/Network.hpp"
+#include <SFML/Network.hpp>

 #include <libintl.h>
 #define _(x) gettext(x)
@@ -41,22 +41,17 @@
 #define snprintf _snprintf
 #endif

-#ifdef UPDATE_REG
-#undef UPDATE_REG
-#endif
 #define UPDATE_REG(address, value) WRITE16LE(((uint16_t*)&g_ioMem[address]), value)

 static int vbaid = 0;
 const char* MakeInstanceFilename(const char* Input)
 {
-    if (vbaid == 0) {
+    if (vbaid == 0)
        return Input;
-    }

    static char* result = NULL;
-    if (result != NULL) {
+    if (result != NULL)
        free(result);
-    }

    result = (char*)malloc(strlen(Input) + 3);
    char* p = strrchr((char*)Input, '.');
@@ -275,7 +270,7 @@ class RFUServer {

 public:
    sf::TcpSocket tcpsocket[5];
-    sf::IpAddress udpaddr[5] = { sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0} };
+    sf::IpAddress udpaddr[5];
    RFUServer(void);
    sf::Packet& Serialize(sf::Packet& packet, int slave);
    void DeSerialize(sf::Packet& packet, int slave);
@@ -288,7 +283,7 @@ class RFUClient {
    int numbytes;

 public:
-    sf::IpAddress serveraddr{0};
+    sf::IpAddress serveraddr;
    unsigned short serverport;
    bool transferring;
    RFUClient(void);
@@ -397,7 +392,7 @@ enum {
 typedef struct {
    sf::TcpSocket tcpsocket;
    sf::TcpListener tcplistener;
-    uint16_t numslaves;
+    int numslaves;
    int connectedSlaves;
    int type;
    bool server;
@@ -417,7 +412,7 @@ class CableServer {

 public:
    sf::TcpSocket tcpsocket[4];
-    sf::IpAddress udpaddr[4] = { sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0} };
+    sf::IpAddress udpaddr[4];
    CableServer(void);
    void Send(void);
    void Recv(void);
@@ -435,7 +430,7 @@ class CableClient {
    int numbytes;

 public:
-    sf::IpAddress serveraddr{0};
+    sf::IpAddress serveraddr;
    unsigned short serverport;
    bool transferring;
    CableClient(void);
@@ -525,48 +520,33 @@ LinkMode GetLinkMode()
        return LINK_DISCONNECTED;
 }

-bool GetLinkServerHost(char* const host, size_t size)
+void GetLinkServerHost(char* const host, size_t size)
 {
-    if (host == NULL || size == 0) {
-        return false;
-    }
+    if (host == NULL || size == 0)
+        return;

    host[0] = '\0';

-    if (linkDriver && linkDriver->mode == LINK_GAMECUBE_DOLPHIN) {
+    if (linkDriver && linkDriver->mode == LINK_GAMECUBE_DOLPHIN)
        strncpy(host, joybusHostAddr.toString().c_str(), size);
-    } else if (lanlink.server) {
-        if (IP_LINK_BIND_ADDRESS == "*") {
-            auto local_addr = sf::IpAddress::getLocalAddress();
-            if (local_addr) {
-                strncpy(host, local_addr.value().toString().c_str(), size);
-            } else {
-                return false;
-            }
-        } else {
+    else if (lanlink.server) {
+        if (IP_LINK_BIND_ADDRESS == "*")
+            strncpy(host, sf::IpAddress::getLocalAddress().toString().c_str(), size);
+        else
            strncpy(host, IP_LINK_BIND_ADDRESS.c_str(), size);
    }
-    }
-    else {
+    else
        strncpy(host, lc.serveraddr.toString().c_str(), size);
 }

-    return true;
-}
-
 bool SetLinkServerHost(const char* host)
 {
-    sf::IpAddress addr{0};
+    sf::IpAddress addr = sf::IpAddress(host);

-    auto resolved = sf::IpAddress::resolve(host);
-    if (!resolved) {
-        return false;
-    }
-    addr = resolved.value();
    lc.serveraddr = addr;
    joybusHostAddr = addr;

-    return true;
+    return addr != sf::IpAddress::None;
 }

 int GetLinkPlayerId()
@@ -1064,13 +1044,11 @@ static ConnectionState InitSocket()
 {
    linkid = 0;

-    for (int i = 0; i < 4; i++) {
+    for (int i = 0; i < 4; i++)
        cable_data[i] = 0xffff;
-    }

-    for (int i = 0; i < 4; i++) {
+    for (int i = 0; i < 4; i++)
        cable_gb_data[i] = 0xff;
-    }

    if (lanlink.server) {
        lanlink.connectedSlaves = 0;
@@ -1079,32 +1057,25 @@ static ConnectionState InitSocket()

        // too bad Listen() doesn't take an address as well
        // then again, old code used INADDR_ANY anyway
-        sf::IpAddress bind_ip{0};
+        sf::IpAddress bind_ip = IP_LINK_BIND_ADDRESS == "*" ? sf::IpAddress::Any : IP_LINK_BIND_ADDRESS;

-        if (IP_LINK_BIND_ADDRESS != "*") {
-            auto resolved = sf::IpAddress::resolve(IP_LINK_BIND_ADDRESS);
-            if (resolved) {
-                bind_ip = resolved.value();
-            } else {
-                return LINK_ERROR;
-            }
-        }
-
-        if (lanlink.tcplistener.listen(IP_LINK_PORT, bind_ip) == sf::Socket::Status::Error) {
+        if (lanlink.tcplistener.listen(IP_LINK_PORT, bind_ip) == sf::Socket::Error)
            // Note: old code closed socket & retried once on bind failure
            return LINK_ERROR; // FIXME: error code?
-        } else {
+        else
            return LINK_NEEDS_UPDATE;
-        }
    } else {
        lc.serverport = IP_LINK_PORT;

+        if (lc.serveraddr == sf::IpAddress::None) {
+            return LINK_ERROR;
+        } else {
            lanlink.tcpsocket.setBlocking(false);
            sf::Socket::Status status = lanlink.tcpsocket.connect(lc.serveraddr, lc.serverport);

-        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
+            if (status == sf::Socket::Error || status == sf::Socket::Disconnected)
                return LINK_ERROR;
-        } else {
+            else
                return LINK_NEEDS_UPDATE;
        }
    }
@@ -1119,11 +1090,11 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
        fdset.add(lanlink.tcplistener);

        if (fdset.wait(sf::milliseconds(150))) {
-            uint16_t nextSlave = lanlink.connectedSlaves + 1;
+            int nextSlave = lanlink.connectedSlaves + 1;

            sf::Socket::Status st = lanlink.tcplistener.accept(ls.tcpsocket[nextSlave]);

-            if (st == sf::Socket::Status::Error) {
+            if (st == sf::Socket::Error) {
                for (int j = 1; j < nextSlave; j++)
                    ls.tcpsocket[j].disconnect();

@@ -1131,7 +1102,8 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
                newState = LINK_ERROR;
            } else {
                sf::Packet packet;
-                packet << nextSlave << lanlink.numslaves;
+                packet << static_cast<sf::Uint16>(nextSlave)
+                       << static_cast<sf::Uint16>(lanlink.numslaves);

                ls.tcpsocket[nextSlave].send(packet);

@@ -1157,13 +1129,13 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
        sf::Packet packet;
        sf::Socket::Status status = lanlink.tcpsocket.receive(packet);

-        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
+        if (status == sf::Socket::Error || status == sf::Socket::Disconnected) {
            snprintf(message, size, N_("Network error."));
            newState = LINK_ERROR;
-        } else if (status == sf::Socket::Status::Done) {
+        } else if (status == sf::Socket::Done) {

            if (linkid == 0) {
-                uint16_t receivedId, receivedSlaves;
+                sf::Uint16 receivedId, receivedSlaves;
                packet >> receivedId >> receivedSlaves;

                if (packet) {
@@ -1568,7 +1540,7 @@ void RFUServer::Recv(void)
            sf::Packet packet;
            tcpsocket[i + 1].setBlocking(false);
            sf::Socket::Status status = tcpsocket[i + 1].receive(packet);
-            if (status == sf::Socket::Status::Disconnected) {
+            if (status == sf::Socket::Disconnected) {
                char message[30];
                sprintf(message, _("Player %d disconnected."), i + 1);
                systemScreenMessage(message);
@@ -1678,7 +1650,7 @@ void RFUClient::Recv(void)
    }
    sf::Packet packet;
    sf::Socket::Status status = lanlink.tcpsocket.receive(packet);
-    if (status == sf::Socket::Status::Disconnected) {
+    if (status == sf::Socket::Disconnected) {
        systemScreenMessage(_("Server disconnected."));
        CloseLink();
        return;
@@ -1699,7 +1671,7 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)

            sf::Socket::Status st = lanlink.tcplistener.accept(rfu_server.tcpsocket[nextSlave]);

-            if (st == sf::Socket::Status::Error) {
+            if (st == sf::Socket::Error) {
                for (int j = 1; j < nextSlave; j++)
                    rfu_server.tcpsocket[j].disconnect();

@@ -1707,7 +1679,8 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)
                newState = LINK_ERROR;
            } else {
                sf::Packet packet;
-                packet << nextSlave << lanlink.numslaves;
+                packet << static_cast<sf::Uint16>(nextSlave)
+                       << static_cast<sf::Uint16>(lanlink.numslaves);

                rfu_server.tcpsocket[nextSlave].send(packet);

@@ -1734,13 +1707,13 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)
        lanlink.tcpsocket.setBlocking(false);
        sf::Socket::Status status = lanlink.tcpsocket.receive(packet);

-        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
+        if (status == sf::Socket::Error || status == sf::Socket::Disconnected) {
            snprintf(message, size, N_("Network error."));
            newState = LINK_ERROR;
-        } else if (status == sf::Socket::Status::Done) {
+        } else if (status == sf::Socket::Done) {

            if (linkid == 0) {
-                uint16_t receivedId, receivedSlaves;
+                sf::Uint16 receivedId, receivedSlaves;
                packet >> receivedId >> receivedSlaves;

                if (packet) {
--- a/src/core/gba/gbaLink.h
+++ b/src/core/gba/gbaLink.h
@@ -86,9 +86,8 @@ extern bool SetLinkServerHost(const char* host);
 * If in lan client mode, returns the IP adress of the host to connect to
 * If in gamecube mode, returns the IP adress of the dolphin host
 *
- * @return false on error
 */
-extern bool GetLinkServerHost(char* const host, size_t size);
+extern void GetLinkServerHost(char* const host, size_t size);

 /**
 * Set the value in milliseconds of the timeout after which a connection is
--- a/src/core/gba/internal/gbaSockClient.cpp
+++ b/src/core/gba/internal/gbaSockClient.cpp
@@ -8,6 +8,9 @@

 GBASockClient::GBASockClient(sf::IpAddress _server_addr)
 {
+    if (_server_addr == sf::IpAddress::None)
+        server_addr = sf::IpAddress::getPublicAddress();
+    else
        server_addr = _server_addr;

    client.connect(server_addr, 0xd6ba);
@@ -41,9 +44,8 @@ void GBASockClient::Send(std::vector<char> data)
 // Returns cmd for convenience
 char GBASockClient::ReceiveCmd(char* data_in, bool block)
 {
-    if (IsDisconnected()) {
+    if (IsDisconnected())
        return data_in[0];
-    }

    std::size_t num_received = 0;
    if (block || clock_sync == 0) {
@@ -51,9 +53,8 @@ char GBASockClient::ReceiveCmd(char* data_in, bool block)
        Selector.add(client);
        Selector.wait(sf::seconds(6));
    }
-    if (client.receive(data_in, 5, num_received) == sf::Socket::Status::Disconnected) {
+    if (client.receive(data_in, 5, num_received) == sf::Socket::Disconnected)
        Disconnect();
-    }

    return data_in[0];
 }
@@ -66,15 +67,13 @@ void GBASockClient::ReceiveClock(bool block)

    char sync_ticks[4] = { 0, 0, 0, 0 };
    std::size_t num_received = 0;
-    if (clock_client.receive(sync_ticks, 4, num_received) == sf::Socket::Status::Disconnected) {
+    if (clock_client.receive(sync_ticks, 4, num_received) == sf::Socket::Disconnected)
        Disconnect();
-    }

    if (num_received == 4) {
        clock_sync_ticks = 0;
-        for (int i = 0; i < 4; i++) {
+        for (int i = 0; i < 4; i++)
            clock_sync_ticks |= (uint8_t)(sync_ticks[i]) << ((3 - i) * 8);
-        }
        clock_sync += clock_sync_ticks;
    }
 }
--- a/src/core/gba/internal/gbaSockClient.h
+++ b/src/core/gba/internal/gbaSockClient.h
@@ -7,7 +7,7 @@

 #include <cstdint>

-#include "SFML/Network.hpp"
+#include <SFML/Network.hpp>

 class GBASockClient {
 public:
@@ -24,7 +24,7 @@ public:
    bool IsDisconnected();

 private:
-    sf::IpAddress server_addr{0};
+    sf::IpAddress server_addr;
    sf::TcpSocket client;
    sf::TcpSocket clock_client;

--- a/src/core/test/CMakeLists.txt
+++ b/src/core/test/CMakeLists.txt
@@ -1,13 +0,0 @@
-# This defines the `vbam-core-fake` library, which is used for providing a fake
-# implementation of the core library for testing purposes.
-
-if(NOT BUILD_TESTING)
-    return()
-endif()
-
-add_library(vbam-core-fake OBJECT)
-
-target_sources(vbam-core-fake
-    PRIVATE
-    fake_core.cpp
-)
--- a/src/core/test/fake_core.cpp
+++ b/src/core/test/fake_core.cpp
@@ -1,94 +0,0 @@
-#include "core/base/system.h"
-
-void systemMessage(int, const char*, ...) {}
-
-void log(const char*, ...) {}
-
-bool systemPauseOnFrame() {
-    return false;
-}
-
-void systemGbPrint(uint8_t*, int, int, int, int, int) {}
-
-void systemScreenCapture(int) {}
-
-void systemDrawScreen() {}
-
-void systemSendScreen() {}
-
-bool systemReadJoypads() {
-    return false;
-}
-
-uint32_t systemReadJoypad(int) {
-    return 0;
-}
-
-uint32_t systemGetClock() {
-    return 0;
-}
-
-void systemSetTitle(const char*) {}
-
-std::unique_ptr<SoundDriver> systemSoundInit() {
-    return nullptr;
-}
-
-void systemOnWriteDataToSoundBuffer(const uint16_t* /*finalWave*/, int /*length*/) {}
-
-void systemOnSoundShutdown() {}
-
-void systemScreenMessage(const char*) {}
-
-void systemUpdateMotionSensor() {}
-
-int systemGetSensorX() {
-    return 0;
-}
-
-int systemGetSensorY() {
-    return 0;
-}
-
-int systemGetSensorZ() {
-    return 0;
-}
-
-uint8_t systemGetSensorDarkness() {
-    return 0;
-}
-
-void systemCartridgeRumble(bool) {}
-
-void systemPossibleCartridgeRumble(bool) {}
-
-void updateRumbleFrame() {}
-
-bool systemCanChangeSoundQuality() {
-    return false;
-}
-
-void systemShowSpeed(int) {}
-
-void system10Frames() {}
-
-void systemFrame() {}
-
-void systemGbBorderOn() {}
-
-void (*dbgOutput)(const char* s, uint32_t addr);
-void (*dbgSignal)(int sig, int number);
-
-uint16_t systemColorMap16[0x10000];
-uint32_t systemColorMap32[0x10000];
-uint16_t systemGbPalette[24];
-int systemRedShift;
-int systemGreenShift;
-int systemBlueShift;
-int systemColorDepth;
-int systemVerbose;
-int systemFrameSkip;
-int systemSaveUpdateCounter;
-int systemSpeed;
-
-int emulating = 0;
--- a/src/gb-over.ini
+++ b/src/gb-over.ini
@@ -1,4 +0,0 @@
-# Game Boy Overrrides
-
-[ALLEY WAY]
-gbPrinter = 0
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -79,7 +79,7 @@ else ifeq ($(platform), classic_armv7_a7)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
 	SHARED := -shared -Wl,--no-undefined -fPIC
-	CFLAGS += -O3 -ffast-math \
+	CFLAGS += -Ofast \
 	-flto=4 -fwhole-program -fuse-linker-plugin \
 	-fdata-sections -ffunction-sections -Wl,--gc-sections \
 	-fno-stack-protector -fno-ident -fomit-frame-pointer \
@@ -112,7 +112,7 @@ else ifeq ($(platform), classic_armv8_a35)
 	fpic := -fPIC
 	SHARED := -shared
 	TILED_RENDERING=1
-	CFLAGS += -O3 -ffast-math \
+	CFLAGS += -Ofast \
 	-flto=4 -fwhole-program -fuse-linker-plugin \
 	-fdata-sections -ffunction-sections -Wl,--gc-sections \
 	-fno-stack-protector -fno-ident -fomit-frame-pointer \
@@ -311,7 +311,7 @@ else ifeq ($(platform), wiiu)
 	CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 	AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
 	ENDIANNESS_DEFINES += -DMSB_FIRST -DWORDS_BIGENDIAN=1
-	PLATFORM_DEFINES += -DGEKKO -DWIIU -DHW_WUP -mcpu=750 -meabi -mhard-float -D__ppc__
+	PLATFORM_DEFINES += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__ppc__
 	PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 	STATIC_LINKING=1
 	TILED_RENDERING=1
@@ -325,15 +325,14 @@ else ifeq ($(platform), libnx)
 		      -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -Wl,--allow-multiple-definition -specs=$(LIBNX)/switch.specs
 	CFLAGS += $(INCDIRS)
 	CFLAGS += $(INCLUDE) -D__SWITCH__ -DHAVE_LIBNX
-	CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fno-rtti -fno-exceptions
+	CXXFLAGS := $(ASFLAGS) $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+	CFLAGS += -std=gnu11
 	STATIC_LINKING=1

-# Nintendo Switch (devkitpro)
+# Nintendo Switch (libtransistor)
 else ifeq ($(platform), switch)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = $(DEVKITPRO)/devkitA64/bin/aarch64-none-elf-gcc$(EXE_EXT)
-	CXX = $(DEVKITPRO)/devkitA64/bin/aarch64-none-elf-g++$(EXE_EXT)
-	AR = $(DEVKITPRO)/devkitA64/bin/aarch64-none-elf-ar$(EXE_EXT)
+	include $(LIBTRANSISTOR_HOME)/libtransistor.mk
 	STATIC_LINKING=1
 	TILED_RENDERING=1

--- a/src/libretro/libretro.cpp
+++ b/src/libretro/libretro.cpp
@@ -1,3 +1,4 @@
+#include <cassert>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
@@ -11,7 +12,6 @@

 #include "components/filters_agb/filters_agb.h"
 #include "components/filters_interframe/interframe.h"
-#include "core/base/check.h"
 #include "core/base/system.h"
 #include "core/base/file_util.h"
 #include "core/base/sizes.h"
@@ -177,7 +177,8 @@ static void* gb_rtcdata_prt(void)
    case gbCartData::MapperType::kGameGenie:
    case gbCartData::MapperType::kGameShark:
    case gbCartData::MapperType::kUnknown:
-        VBAM_NOTREACHED();
+        // Unreachable.
+        assert(false);
        return nullptr;
    }
    return nullptr;
@@ -204,7 +205,8 @@ static size_t gb_rtcdata_size(void)
    case gbCartData::MapperType::kGameGenie:
    case gbCartData::MapperType::kGameShark:
    case gbCartData::MapperType::kUnknown:
-        VBAM_NOTREACHED();
+        // Unreachable.
+        assert(false);
        break;
    }
    return 0;
@@ -270,7 +272,8 @@ static void gbInitRTC(void)
    case gbCartData::MapperType::kGameGenie:
    case gbCartData::MapperType::kGameShark:
    case gbCartData::MapperType::kUnknown:
-        VBAM_NOTREACHED();
+        // Unreachable.
+        assert(false);
        break;
    }
 }
@@ -590,7 +593,7 @@ void retro_init(void)
    coreOptions.parseDebug = true;
    coreOptions.cheatsEnabled = 0;
    coreOptions.skipSaveGameBattery = 0;
-    coreOptions.gbPrinterEnabled = 0;
+    coreOptions.winGbPrinterEnabled = 0;

    struct retro_log_callback log;
    struct retro_rumble_interface rumble;
@@ -1453,7 +1456,8 @@ void retro_run(void)
            case gbCartData::MapperType::kGameGenie:
            case gbCartData::MapperType::kGameShark:
            case gbCartData::MapperType::kUnknown:
-                VBAM_NOTREACHED();
+                // Unreachable.
+                assert(false);
                break;
            }
            /* Initialize RTC using local time if needed */
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -31,8 +31,8 @@ if(MSVC)
    # We should probably use an external library for this.
    target_sources(vbam
        PRIVATE
-        ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.c
-        ${CMAKE_SOURCE_DIR}/win32-deps/msvc/getopt.h
+        ${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.c
+        ${CMAKE_SOURCE_DIR}/dependencies/msvc/getopt.h
    )
 endif()

@@ -61,7 +61,7 @@ endif()

 if(ENABLE_LIRC)
    target_link_libraries(vbam lirc_client)
-    target_compile_definitions(vbam PUBLIC VBAM_ENABLE_LIRC)
+    target_compile_definitions(vbam VBAM_ENABLE_LIRC)
 endif()

 if(WIN32)
@@ -71,15 +71,15 @@ endif()
 # Installation scripts.
 install(
    PROGRAMS ${PROJECT_BINARY_DIR}/vbam${CMAKE_EXECUTABLE_SUFFIX}
-    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
 )
 install(
    FILES ${CMAKE_CURRENT_LIST_DIR}/vbam.cfg-example
-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
+    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
    RENAME vbam.cfg
 )

 if(UNIX)
    # man pages.
-    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/vbam.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
 endif()
--- a/src/sdl/ConfigManager.cpp
+++ b/src/sdl/ConfigManager.cpp
@@ -98,8 +98,7 @@ enum named_opts
 	OPT_SOUND_FILTERING,
 	OPT_SPEEDUP_THROTTLE,
 	OPT_SPEEDUP_FRAME_SKIP,
-	OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP,
-	OPT_NO_SPEEDUP_MUTE
+	OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP
 };

 #define SOUND_MAX_VOLUME 2.0
@@ -189,7 +188,7 @@ struct option argOptions[] = {
 	{ "gb-emulator-type", required_argument, 0, OPT_GB_EMULATOR_TYPE },
 	{ "gb-frame-skip", required_argument, 0, OPT_GB_FRAME_SKIP },
 	{ "gb-palette-option", required_argument, 0, OPT_GB_PALETTE_OPTION },
-	{ "gb-printer", no_argument, &coreOptions.gbPrinterEnabled, 1 },
+	{ "gb-printer", no_argument, &coreOptions.winGbPrinterEnabled, 1 },
 	{ "gdb", required_argument, 0, 'G' },
 	{ "help", no_argument, &optPrintUsage, 1 },
 	{ "ifb-filter", required_argument, 0, 'I' },
@@ -233,10 +232,9 @@ struct option argOptions[] = {
 	{ "speedup-throttle", required_argument, 0, OPT_SPEEDUP_THROTTLE },
 	{ "speedup-frame-skip", required_argument, 0, OPT_SPEEDUP_FRAME_SKIP },
 	{ "no-speedup-throttle-frame-skip", no_argument, 0, OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP },
-	{ "no-speedup-mute", no_argument, 0, OPT_NO_SPEEDUP_MUTE },
 	{ "use-bios", no_argument, &coreOptions.useBios, 1 },
 	{ "verbose", required_argument, 0, 'v' },
-	{ "win-gb-printer-enabled", no_argument, &coreOptions.gbPrinterEnabled, 1 },
+	{ "win-gb-printer-enabled", no_argument, &coreOptions.winGbPrinterEnabled, 1 },


 	{ NULL, no_argument, NULL, 0 }
@@ -349,9 +347,8 @@ void LoadConfig()
 	coreOptions.speedup_throttle = ReadPref("speedupThrottle", 100);
 	coreOptions.speedup_frame_skip = ReadPref("speedupFrameSkip", 9);
 	coreOptions.speedup_throttle_frame_skip = ReadPref("speedupThrottleFrameSkip", 0);
-	coreOptions.speedup_mute = ReadPref("speedupMute", 1);
 	coreOptions.useBios = ReadPrefHex("useBiosGBA");
-	coreOptions.gbPrinterEnabled = ReadPref("gbPrinter", 0);
+	coreOptions.winGbPrinterEnabled = ReadPref("gbPrinter", 0);

 	int soundQuality = (ReadPrefHex("soundQuality", 1));
 	switch (soundQuality) {
@@ -993,9 +990,6 @@ int ReadOpts(int argc, char ** argv)
 		case OPT_NO_SPEEDUP_THROTTLE_FRAME_SKIP:
 			coreOptions.speedup_throttle_frame_skip = false;
 			break;
-		case OPT_NO_SPEEDUP_MUTE:
-			coreOptions.speedup_mute = false;
-			break;
 		}
 	}
 	return op;
--- a/src/vba-over.ini
+++ b/src/vba-over.ini
@@ -364,10 +364,6 @@ mirroringEnabled=1
 saveType=1
 mirroringEnabled=1

-# Higurashi no Nakukoroni (Japan)
-[HGRS]
-saveType=2
-
 # Koro Koro Puzzle - Happy Panechu! (Japan)
 [KHPJ]
 saveType=4
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -13,6 +13,22 @@ set(VBAM_WX_COMMON
    background-input.cpp
    background-input.h
    cmdevents.cpp
+    config/game-control.cpp
+    config/game-control.h
+    config/internal/option-internal.cpp
+    config/internal/option-internal.h
+    config/internal/shortcuts-internal.cpp
+    config/internal/shortcuts-internal.h
+    config/option-id.h
+    config/option-observer.cpp
+    config/option-observer.h
+    config/option-proxy.h
+    config/option.cpp
+    config/option.h
+    config/shortcuts.cpp
+    config/shortcuts.h
+    config/user-input.cpp
+    config/user-input.h
    dialogs/accel-config.cpp
    dialogs/accel-config.h
    dialogs/base-dialog.cpp
@@ -31,8 +47,6 @@ set(VBAM_WX_COMMON
    dialogs/joypad-config.h
    dialogs/sound-config.cpp
    dialogs/sound-config.h
-    dialogs/speedup-config.cpp
-    dialogs/speedup-config.h
    drawing.h
    extra-translations.cpp
    gfxviewers.cpp
@@ -42,12 +56,37 @@ set(VBAM_WX_COMMON
    opts.h
    panel.cpp
    rpi.h
+    strutils.cpp
+    strutils.h
    sys.cpp
    viewers.cpp
    viewsupt.cpp
    viewsupt.h
    wayland.cpp
    wayland.h
+    # from external source with minor modifications
+    widgets/checkedlistctrl.cpp
+    widgets/checkedlistctrl.h
+    widgets/dpi-support.h
+    widgets/group-check-box.cpp
+    widgets/group-check-box.h
+    widgets/keep-on-top-styler.cpp
+    widgets/keep-on-top-styler.h
+    widgets/option-validator.cpp
+    widgets/option-validator.h
+    widgets/render-plugin.cpp
+    widgets/render-plugin.h
+    widgets/user-input-ctrl.cpp
+    widgets/user-input-ctrl.h
+    widgets/user-input-event.cpp
+    widgets/user-input-event.h
+    widgets/sdl-poller.cpp
+    widgets/sdl-poller.h
+    widgets/utils.cpp
+    widgets/utils.h
+    widgets/webupdatedef.h
+    widgets/wxmisc.h
+    widgets/wxmisc.cpp
    wxhead.h
    wxlogdebug.h
    wxvbam.cpp
@@ -59,7 +98,7 @@ set(VBAM_WX_COMMON
    ${VBAM_GENERATED_DIR}/wx/builtin-over.h
    ${VBAM_GENERATED_DIR}/wx/cmdhandlers.h
    ${VBAM_GENERATED_DIR}/wx/cmd-evtable.h
-    ${VBAM_GENERATED_DIR}/wx/gb-builtin-over.h
+    ${VBAM_GENERATED_DIR}/wx/cmdtab.cpp
 )

 if(NOT ZIP_PROGRAM)
@@ -140,176 +179,6 @@ if(TRANSLATIONS_ONLY)
    return()
 endif()

-# wxWidgets configuration.
-set(wxWidgets_USE_UNICODE ON)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
-endif()
-if(VBAM_STATIC)
-    set(wxWidgets_USE_STATIC ON)
-endif()
-
-unset(wx_find_extra)
-if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
-  set(wx_find_extra NO_DEFAULT_PATH)
-  set(wxWidgets_DIR "${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/share/wxwidgets")
-  find_package(nanosvg)
-endif()
-
-set(ENABLE_OPENGL TRUE)
-find_package(wxWidgets COMPONENTS xrc xml html adv net core base gl ${wx_find_extra})
-
-if(NOT wxWidgets_FOUND)
-    find_package(wxWidgets COMPONENTS xrc xml html adv net core base ${wx_find_extra} REQUIRED)
-    set(ENABLE_OPENGL FALSE)
-endif()
-
-# Fixup wxWidgets paths for vcpkg debug builds.
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
-    set(wxWidgets_ROOT_DIR "${wxWidgets_ROOT_DIR}/debug" CACHE INTERNAL "wxWidgets root directory" FORCE)
-    string(REGEX REPLACE "/lib$" "/debug/lib" wxWidgets_LIB_DIR "${wxWidgets_LIB_DIR}")
-    set(wxWidgets_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "wxWidgets library directory" FORCE)
-endif()
-
-# Find OpenAL (required).
-find_package(OpenAL REQUIRED)
-
-# Workaround of static liblzma not being found on MSYS2.
-if(VBAM_STATIC AND MSYS)
-    unset(cleaned_up_wx_libs)
-    foreach(lib ${wxWidgets_LIBRARIES})
-        if(lib STREQUAL "-llzma")
-            set(lib "liblzma.a")
-        endif()
-
-        list(APPEND cleaned_up_wx_libs "${lib}")
-    endforeach()
-
-    set(wxWidgets_LIBRARIES "${cleaned_up_wx_libs}")
-endif()
-
-list(APPEND CMAKE_REQUIRED_LIBRARIES ${wxWidgets_LIBRARIES})
-list(APPEND CMAKE_REQUIRED_INCLUDES ${wxWidgets_INCLUDE_DIRS})
-list(APPEND CMAKE_REQUIRED_FLAGS ${wxWidgets_CXX_FLAGS})
-foreach(DEF ${wxWidgets_DEFINITIONS})
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D${DEF}")
-endforeach()
-
-# Configure common settings for wx-based targets, like linking, include
-# directories, compile options, and definitions.
-function(configure_wx_target target)
-    get_target_property(target_type ${target} TYPE)
-    if(target_type STREQUAL "EXECUTABLE")
-        set(target_is_executable TRUE)
-    else()
-        set(target_is_executable FALSE)
-    endif()
-
-    function(_add_link_libraries)
-        if(${target_is_executable})
-            target_link_libraries(${target} ${ARGN})
-        else()
-            target_link_libraries(${target} PUBLIC ${ARGN})
-        endif()
-    endfunction()
-
-    function(_add_include_directories)
-        if(${target_is_executable})
-            target_include_directories(${target} PRIVATE ${ARGN})
-        else()
-            target_include_directories(${target} PUBLIC ${ARGN})
-        endif()
-    endfunction()
-
-    function(_add_compile_options)
-        if(${target_is_executable})
-            target_compile_options(${target} PRIVATE ${ARGN})
-        else()
-            target_compile_options(${target} PUBLIC ${ARGN})
-        endif()
-    endfunction()
-
-    function(_add_compile_definitions)
-        if(${target_is_executable})
-            target_compile_definitions(${target} PRIVATE ${ARGN})
-        else()
-            target_compile_definitions(${target} PUBLIC ${ARGN})
-        endif()
-    endfunction()
-
-    # Core emulator.
-    _add_link_libraries(vbam-core)
-
-    # Nonstd.
-    _add_link_libraries(nonstd-lib)
-    _add_include_directories(${NONSTD_INCLUDE_DIR})
-
-    # wxWidgets.
-    _add_link_libraries(${wxWidgets_LIBRARIES})
-    _add_include_directories(${wxWidgets_INCLUDE_DIRS})
-    _add_compile_options(${wxWidgets_CXX_FLAGS})
-    _add_compile_definitions(${wxWidgets_DEFINITIONS})
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        _add_compile_definitions(${wxWidgets_DEFINITIONS_DEBUG})
-    endif()
-
-    # OpenAL.
-    if(OPENAL_STATIC)
-        _add_compile_definitions(AL_LIBTYPE_STATIC)
-
-        if(WIN32)
-            list(APPEND OPENAL_LIBRARY avrt)
-        endif()
-    endif()
-    _add_include_directories(${OPENAL_INCLUDE_DIR})
-    _add_link_libraries(${OPENAL_LIBRARY})
-
-    # XAudio2.
-    if(ENABLE_XAUDIO2)
-        _add_compile_definitions(VBAM_ENABLE_XAUDIO2)
-    endif()
-
-    # FAudio.
-    if(ENABLE_FAUDIO)
-        _add_compile_definitions(VBAM_ENABLE_FAUDIO)
-        if(MSVC)
-            _add_link_libraries(FAudio::FAudio)
-        else()
-            if(WIN32)
-                if(MINGW AND VBAM_STATIC)
-                    _add_link_libraries(FAudio.a)
-                else()
-                    _add_link_libraries(FAudio)
-                endif()
-                _add_link_libraries(dxguid uuid winmm ole32 advapi32 user32 mfplat mfreadwrite mfuuid propsys)
-            else()
-                _add_link_libraries(FAudio)
-            endif()
-        endif()
-    endif()
-
-    # Direct3D.
-    if(NOT ENABLE_DIRECT3D)
-        _add_compile_definitions(NO_D3D)
-    endif()
-
-    # SDL2.
-    _add_link_libraries(${VBAM_SDL2_LIBS})
-
-    # OpenGL.
-    if(ENABLE_OPENGL)
-        _add_link_libraries(${OPENGL_LIBRARIES})
-    else()
-        _add_compile_definitions(NO_OGL)
-    endif()
-
-endfunction()
-
-# Sub-projects.
-add_subdirectory(test)
-add_subdirectory(config)
-add_subdirectory(widgets)
-
 set(VBAM_ICON visualboyadvance-m.icns)
 set(VBAM_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons/${VBAM_ICON})

@@ -320,17 +189,19 @@ add_executable(
 )

 target_sources(visualboyadvance-m PRIVATE ${VBAM_WX_COMMON} ${VBAM_ICON_PATH})
-target_include_directories(visualboyadvance-m PRIVATE ${SDL2_INCLUDE_DIRS})
+target_include_directories(visualboyadvance-m PRIVATE ${NONSTD_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS})

 target_link_libraries(
    visualboyadvance-m
+    nonstd-lib
+    vbam-core
    vbam-components-draw-text
    vbam-components-filters
    vbam-components-filters-agb
    vbam-components-filters-interframe
    vbam-components-user-config
-    vbam-wx-config
-    vbam-wx-widgets
+    ${OPENGL_LIBRARIES}
+    ${VBAM_SDL2_LIBS}
 )

 # adjust link command when making a static binary for gcc
@@ -399,15 +270,21 @@ if(WIN32)
        # Disable the auto-generated manifest from CMake.
        target_link_options(visualboyadvance-m PRIVATE "/MANIFEST:NO")
    endif()
+
+    # wxWidgets fails to bring in its dependency.
+    find_library(PCRE_LIB pcre2-16 REQUIRED)
+    target_link_libraries(visualboyadvance-m ${PCRE_LIB})
 endif()

 if(APPLE)
    target_sources(visualboyadvance-m PRIVATE
        macsupport.mm
+        widgets/dpi-support-mac.mm
+  )
+else()
+    target_sources(visualboyadvance-m PRIVATE
+        widgets/dpi-support.cpp
    )
-
-    target_link_libraries(visualboyadvance-m
-      tiff zstd deflate)
 endif()

 # link libgcc/libstdc++ statically on mingw
@@ -431,17 +308,82 @@ if(CMAKE_COMPILER_IS_GNUCXX AND VBAM_STATIC)
    endif()
 endif()

+# OpenAL.
+find_package(OpenAL REQUIRED)
+if(OPENAL_STATIC)
+    target_compile_definitions(visualboyadvance-m PRIVATE AL_LIBTYPE_STATIC)
+endif()
+target_include_directories(visualboyadvance-m PRIVATE ${OPENAL_INCLUDE_DIR})
+target_link_libraries(visualboyadvance-m ${OPENAL_LIBRARY})
+
 # XAudio2.
 if(ENABLE_XAUDIO2)
    target_sources(visualboyadvance-m PRIVATE audio/internal/xaudio2.cpp)
+    target_compile_definitions(visualboyadvance-m PRIVATE VBAM_ENABLE_XAUDIO2)
+endif()
+
+# Direct3D.
+if(NOT ENABLE_DIRECT3D)
+    target_compile_definitions(visualboyadvance-m PRIVATE NO_D3D)
 endif()

 # FAudio.
 if(ENABLE_FAUDIO)
    target_sources(visualboyadvance-m PRIVATE audio/internal/faudio.cpp)
+    target_link_libraries(visualboyadvance-m FAudio::FAudio)
+    target_compile_definitions(visualboyadvance-m PRIVATE VBAM_ENABLE_FAUDIO)
 endif()

-configure_wx_target(visualboyadvance-m)
+# wxWidgets.
+set(wxWidgets_USE_UNICODE ON)
+if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+    set(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
+endif()
+if(VBAM_STATIC)
+    set(wxWidgets_USE_STATIC ON)
+endif()
+
+unset(wx_find_extra)
+if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+  set(wx_find_extra NO_DEFAULT_PATH)
+  set(wxWidgets_DIR "${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/share/wxwidgets")
+endif()
+
+find_package(wxWidgets COMPONENTS xrc xml html adv net core base gl ${wx_find_extra})
+
+if(NOT wxWidgets_FOUND)
+    find_package(wxWidgets COMPONENTS xrc xml html adv net core base ${wx_find_extra} REQUIRED)
+    target_compile_definitions(visualboyadvance-m PRIVATE NO_OGL)
+endif()
+
+# Workaround of static liblzma not being found on MSYS2.
+if(VBAM_STATIC AND MSYS)
+    unset(cleaned_up_wx_libs)
+    foreach(lib ${wxWidgets_LIBRARIES})
+        if(lib STREQUAL "-llzma")
+            set(lib "liblzma.a")
+        endif()
+
+        list(APPEND cleaned_up_wx_libs "${lib}")
+    endforeach()
+
+    set(wxWidgets_LIBRARIES "${cleaned_up_wx_libs}")
+endif()
+
+target_link_libraries(visualboyadvance-m ${wxWidgets_LIBRARIES})
+target_include_directories(visualboyadvance-m PRIVATE ${wxWidgets_INCLUDE_DIRS})
+target_compile_options(visualboyadvance-m PRIVATE ${wxWidgets_CXX_FLAGS})
+target_compile_definitions(visualboyadvance-m PRIVATE ${wxWidgets_DEFINITIONS})
+if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
+    target_compile_definitions(visualboyadvance-m PRIVATE ${wxWidgets_DEFINITIONS_DEBUG})
+endif()
+
+list(APPEND CMAKE_REQUIRED_LIBRARIES ${wxWidgets_LIBRARIES})
+list(APPEND CMAKE_REQUIRED_INCLUDES ${wxWidgets_INCLUDE_DIRS})
+list(APPEND CMAKE_REQUIRED_FLAGS ${wxWidgets_CXX_FLAGS})
+foreach(DEF ${wxWidgets_DEFINITIONS})
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D${DEF}")
+endforeach()

 # we make some direct gtk/gdk calls on linux and such
 # so need to link the gtk that wx was built with
@@ -528,7 +470,7 @@ host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})

 # Override wxrc when cross-compiling.
 if(CMAKE_HOST_WIN32 AND CMAKE_CROSSCOMPILING)
-    set(WXRC ${CMAKE_SOURCE_DIR}/win32-deps/wxrc/wxrc.exe)
+    set(WXRC ${CMAKE_SOURCE_DIR}/dependencies/wxrc/wxrc.exe)
 endif()

 # Configure wxrc.
@@ -651,13 +593,24 @@ add_custom_command(
    DEPENDS ${CMAKE_SOURCE_DIR}/src/vba-over.ini ${BIN2C}
 )

+# I don't like duplicating/triplicating code, so I only declare
+# event handlers once, and copy them in other places they are needed
+# all using portable cmake code
 add_custom_command(
-    OUTPUT ${VBAM_GENERATED_DIR}/wx/gb-builtin-over.h
-    COMMAND ${BIN2C} ${CMAKE_SOURCE_DIR}/src/gb-over.ini ${VBAM_GENERATED_DIR}/wx/gb-builtin-over.h gb_builtin_over
-    DEPENDS ${CMAKE_SOURCE_DIR}/src/gb-over.ini ${BIN2C}
+    OUTPUT
+        ${VBAM_GENERATED_DIR}/wx/cmdtab.cpp
+        ${VBAM_GENERATED_DIR}/wx/cmdhandlers.h
+        ${VBAM_GENERATED_DIR}/wx/cmd-evtable.h
+    COMMAND
+        ${CMAKE_COMMAND} -D OUTDIR=${VBAM_GENERATED_DIR}/wx/ -P copy-events.cmake
+    WORKING_DIRECTORY
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS
+        cmdevents.cpp
+        copy-events.cmake
 )

-set(VBAM_LOCALIZABLE_FILES ${VBAM_WX_COMMON} ${VBAM_LOCALIZABLE_WX_CONFIG_FILES})
+set(VBAM_LOCALIZABLE_FILES ${VBAM_WX_COMMON})
 list(APPEND VBAM_LOCALIZABLE_FILES
    audio/internal/dsound.cpp
    audio/internal/faudio.cpp
@@ -679,9 +632,9 @@ if(APPLE)
    set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
 endif()

-if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES)
+if(WIN32 AND (X86_64 OR X86_32) AND ENABLE_ONLINEUPDATES)
    if(NOT DEFINED WINSPARKLE_BIN_RELEASE_DIR)
-        set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/win32-deps/WinSparkle-0.8.1)
+        set(WINSPARKLE_BIN_RELEASE_DIR ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0)
    endif()

    target_include_directories(
@@ -690,11 +643,9 @@ if(WIN32 AND (X86_64 OR ARM64 OR X86_32) AND ENABLE_ONLINEUPDATES)
    )

    if(X86_64)
-        set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/x64/Release/WinSparkle.dll)
-    elseif(ARM64)
-        set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/ARM64/Release/WinSparkle.dll)
-    elseif(X86_32)
-        set(WINSPARKLE_DLL ${WINSPARKLE_BIN_RELEASE_DIR}/Release/WinSparkle.dll)
+        set(WINSPARKLE_DLL ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0/x64/Release/WinSparkle.dll)
+    else()
+        set(WINSPARKLE_DLL ${CMAKE_SOURCE_DIR}/dependencies/WinSparkle-0.6.0/Release/WinSparkle.dll)
    endif()

    configure_file(autoupdater/wxmsw/winsparkle-path.h.in ${CMAKE_BINARY_DIR}/winsparkle-path.h)
@@ -803,7 +754,7 @@ endif()
 if(UPSTREAM_RELEASE AND WIN32)
    set(home "$ENV{HOME}")

-    if(NOT home OR ((MSVC OR NOT CMAKE_CROSSCOMPILING) AND NOT DEFINED ENV{MSYSTEM_PREFIX}))
+    if((MSVC OR NOT CMAKE_CROSSCOMPILING) AND NOT DEFINED ENV{MSYSTEM_PREFIX})
        set(home "$ENV{USERPROFILE}")
    endif()

@@ -811,9 +762,8 @@ if(UPSTREAM_RELEASE AND WIN32)
    string(REGEX REPLACE "\\\\" "/" home "${home}")

    set(cert "${home}/.codesign/windows_comodo.pkcs12")
-    file(STRINGS "${home}/.codesign/windows_comodo.pkcs12.password" cert_password)

-    if(EXISTS "${cert}" AND cert_password)
+    if(EXISTS "${cert}")
        find_program(OSSLSIGNCODE_PROGRAM osslsigncode)
        find_program(SIGNTOOL_PROGRAM     signtool)

@@ -822,7 +772,7 @@ if(UPSTREAM_RELEASE AND WIN32)
                TARGET visualboyadvance-m
                POST_BUILD
                COMMAND ${CMAKE_COMMAND} -E rename visualboyadvance-m.exe visualboyadvance-m-unsigned.exe
-                COMMAND ${OSSLSIGNCODE_PROGRAM} sign -pkcs12 ${cert} -pass "${cert_password}" -t http://timestamp.digicert.com -n visualboyadvance-m -i https://github.com/visualboyadvance-m/visualboyadvance-m -in visualboyadvance-m-unsigned.exe -out visualboyadvance-m.exe
+                COMMAND ${OSSLSIGNCODE_PROGRAM} sign -pkcs12 ${cert} -pass "vbam3!13" -t http://timestamp.digicert.com -n visualboyadvance-m -i https://github.com/visualboyadvance-m/visualboyadvance-m -in visualboyadvance-m-unsigned.exe -out visualboyadvance-m.exe
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                )
        elseif(SIGNTOOL_PROGRAM)
@@ -830,7 +780,7 @@ if(UPSTREAM_RELEASE AND WIN32)
                TARGET visualboyadvance-m
                POST_BUILD
                COMMAND ${CMAKE_COMMAND} -E copy visualboyadvance-m.exe visualboyadvance-m-unsigned.exe
-                COMMAND ${SIGNTOOL_PROGRAM} sign /f ${cert} /fd certHash /td certHash /p "${cert_password}" /tr http://timestamp.digicert.com /du https://github.com/visualboyadvance-m/visualboyadvance-m /a visualboyadvance-m.exe
+                COMMAND ${SIGNTOOL_PROGRAM} sign /f ${cert} /fd certHash /td certHash /p "vbam3!13" /tr http://timestamp.digicert.com /du https://github.com/visualboyadvance-m/visualboyadvance-m /a visualboyadvance-m.exe
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                )
        endif()
@@ -855,7 +805,7 @@ if(UPSTREAM_RELEASE AND WIN32)
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    )

-    if(GPG_SIGNATURES AND GPG_KEYS)
+    if(GPG_KEYS)
        add_custom_command(
            OUTPUT ${CMAKE_BINARY_DIR}/translations.zip.asc
            COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/translations.zip.asc
@@ -904,7 +854,7 @@ if(APPLE)
    if(CMAKE_BUILD_TYPE MATCHES "^(Release|MinSizeRel)$")
        add_custom_command(
            TARGET visualboyadvance-m POST_BUILD
-            COMMAND bash ${CMAKE_SOURCE_DIR}/tools/macOS/third_party_libs_tool ./visualboyadvance-m.app
+            COMMAND ${CMAKE_SOURCE_DIR}/tools/macOS/third_party_libs_tool ./visualboyadvance-m.app
            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
        )
    endif()
@@ -1032,16 +982,20 @@ install(
    BUNDLE  DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

+if(BUILD_TESTING AND (NOT CMAKE_CROSSCOMPILING))
+    add_subdirectory(tests)
+endif()
+
 # Installation scripts.
 install(
    PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX}
-    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
 )
 install(
    FILES ${CMAKE_SOURCE_DIR}/src/vba-over.ini
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/vbam
+    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/vbam
 )

 if (UNIX)
-    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+    install(FILES ${CMAKE_SOURCE_DIR}/src/debian/visualboyadvance-m.6 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man6)
 endif()
--- a/src/wx/audio/audio.cpp
+++ b/src/wx/audio/audio.cpp
@@ -1,12 +1,12 @@
 #include "wx/audio/audio.h"

-#include "core/base/check.h"
 #include "wx/audio/internal/openal.h"

 #if defined(__WXMSW__)
 #include "wx/audio/internal/dsound.h"
 #endif

+
 #if defined(VBAM_ENABLE_FAUDIO)
 #include "wx/audio/internal/faudio.h"
 #endif
@@ -39,7 +39,8 @@ std::vector<AudioDevice> EnumerateAudioDevices(const config::AudioApi& audio_api

        case config::AudioApi::kLast:
        default:
-            VBAM_NOTREACHED();
+            // This should never happen.
+            assert(false);
            return {};
    }
 }
@@ -66,7 +67,8 @@ std::unique_ptr<SoundDriver> CreateSoundDriver(const config::AudioApi& api) {

        case config::AudioApi::kLast:
        default:
-            VBAM_NOTREACHED();
+            // This should never happen.
+            assert(false);
            return nullptr;
    }
 }
--- a/src/wx/audio/internal/faudio.cpp
+++ b/src/wx/audio/internal/faudio.cpp
@@ -5,6 +5,8 @@

 #include "wx/audio/internal/faudio.h"

+#include <cassert>
+
 #include <condition_variable>
 #include <mutex>
 #include <vector>
@@ -16,11 +18,9 @@
 #include <wx/log.h>
 #include <wx/translation.h>

-#include "core/base/check.h"
 #include "core/base/system.h"
 #include "core/gba/gbaGlobals.h"
 #include "wx/config/option-proxy.h"
-#include "wx/config/strutils.h"

 namespace audio {
 namespace internal {
@@ -28,7 +28,7 @@ namespace internal {
 namespace {

 int FAGetDev(FAudio* fa) {
-    const wxString audio_device = OPTION(kSoundAudioDevice).Get();
+    const wxString& audio_device = OPTION(kSoundAudioDevice);
    if (audio_device.empty()) {
        // Just use the default device.
        return 0;
@@ -48,7 +48,7 @@ int FAGetDev(FAudio* fa) {
        if (hr != 0) {
            continue;
        }
-        const wxString device_id = config::utf16_to_utf8(dd.DeviceID);
+        const wxString device_id(reinterpret_cast<wchar_t*>(dd.DeviceID));
        if (audio_device == device_id) {
            return i;
        }
@@ -59,17 +59,6 @@ int FAGetDev(FAudio* fa) {

 class FAudio_BufferNotify : public FAudioVoiceCallback {
 public:
-    FAudio_BufferNotify() {
-        OnBufferEnd = &FAudio_BufferNotify::StaticOnBufferEnd;
-        OnVoiceProcessingPassStart = &FAudio_BufferNotify::StaticOnVoiceProcessingPassStart;
-        OnVoiceProcessingPassEnd = &FAudio_BufferNotify::StaticOnVoiceProcessingPassEnd;
-        OnStreamEnd = &FAudio_BufferNotify::StaticOnStreamEnd;
-        OnBufferStart = &FAudio_BufferNotify::StaticOnBufferStart;
-        OnLoopEnd = &FAudio_BufferNotify::StaticOnLoopEnd;
-        OnVoiceError = &FAudio_BufferNotify::StaticOnVoiceError;
-    }
-    ~FAudio_BufferNotify() = default;
-
    // Waits for the buffer end event to be signaled for 10 seconds.
    // Returns true if the buffer end event was signaled, false if the wait timed out.
    bool WaitForSignal() {
@@ -82,6 +71,17 @@ public:
        return was_signaled;
    }

+    FAudio_BufferNotify() {
+        OnBufferEnd = &FAudio_BufferNotify::StaticOnBufferEnd;
+        OnVoiceProcessingPassStart = &FAudio_BufferNotify::StaticOnVoiceProcessingPassStart;
+        OnVoiceProcessingPassEnd = &FAudio_BufferNotify::StaticOnVoiceProcessingPassEnd;
+        OnStreamEnd = &FAudio_BufferNotify::StaticOnStreamEnd;
+        OnBufferStart = &FAudio_BufferNotify::StaticOnBufferStart;
+        OnLoopEnd = &FAudio_BufferNotify::StaticOnLoopEnd;
+        OnVoiceError = &FAudio_BufferNotify::StaticOnVoiceError;
+    }
+    ~FAudio_BufferNotify() = default;
+
 private:
    // Signals that the buffer end event has occurred.
    void SignalBufferEnd() {
@@ -120,6 +120,8 @@ public:
    FAudio_Output();
    ~FAudio_Output();

+    void device_change();
+
 private:
    void close();

@@ -157,7 +159,6 @@ FAudio_Output::FAudio_Output() : buffer_count_(OPTION(kSoundBuffers)) {
    playing = false;
    freq_ = 0;
    currentBuffer = 0;
-    sound_buffer_len_ = 0;
    device_changed = false;
    faud = nullptr;
    mVoice = nullptr;
@@ -175,7 +176,7 @@ void FAudio_Output::close() {

    if (sVoice) {
        if (playing) {
-            VBAM_CHECK(FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW) == 0);
+            assert(FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW) == 0);
        }

        FAudioVoice_DestroyVoice(sVoice);
@@ -193,6 +194,10 @@ void FAudio_Output::close() {
    }
 }

+void FAudio_Output::device_change() {
+    device_changed = true;
+}
+
 bool FAudio_Output::init(long sampleRate) {
    if (failed || initialized)
        return false;
@@ -254,7 +259,7 @@ bool FAudio_Output::init(long sampleRate) {
    if (OPTION(kSoundUpmix)) {
        // set up stereo upmixing
        FAudioDeviceDetails dd{};
-        VBAM_CHECK(FAudio_GetDeviceDetails(faud, 0, &dd) == 0);
+        assert(FAudio_GetDeviceDetails(faud, 0, &dd) == 0);
        std::vector<float> matrix(sizeof(float) * 2 * dd.OutputFormat.Format.nChannels);

        bool matrixAvailable = true;
@@ -348,12 +353,12 @@ bool FAudio_Output::init(long sampleRate) {
        if (matrixAvailable) {
            hr = FAudioVoice_SetOutputMatrix(sVoice, nullptr, 2, dd.OutputFormat.Format.nChannels,
                                             matrix.data(), FAUDIO_DEFAULT_CHANNELS);
-            VBAM_CHECK(hr == 0);
+            assert(hr == 0);
        }
    }

    hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW);
-    VBAM_CHECK(hr == 0);
+    assert(hr == 0);
    playing = true;
    currentBuffer = 0;
    device_changed = false;
@@ -375,7 +380,7 @@ void FAudio_Output::write(uint16_t* finalWave, int) {
        }

        FAudioSourceVoice_GetState(sVoice, &vState, flags);
-        VBAM_CHECK(vState.BuffersQueued <= buffer_count_);
+        assert(vState.BuffersQueued <= buffer_count_);

        if (vState.BuffersQueued < buffer_count_) {
            if (vState.BuffersQueued == 0) {
@@ -392,7 +397,7 @@ void FAudio_Output::write(uint16_t* finalWave, int) {
            // the maximum number of buffers is currently queued
            if (!coreOptions.speedup && coreOptions.throttle && !gba_joybus_active) {
                // wait for one buffer to finish playing
-                if (!notify.WaitForSignal()) {
+                if (notify.WaitForSignal()) {
                    device_changed = true;
                }
            } else {
@@ -409,7 +414,7 @@ void FAudio_Output::write(uint16_t* finalWave, int) {
    currentBuffer++;
    currentBuffer %= (buffer_count_ + 1);  // + 1 because we need one temporary buffer
    [[maybe_unused]] uint32_t hr = FAudioSourceVoice_SubmitSourceBuffer(sVoice, &buf, nullptr);
-    VBAM_CHECK(hr == 0);
+    assert(hr == 0);
 }

 void FAudio_Output::pause() {
@@ -418,7 +423,7 @@ void FAudio_Output::pause() {

    if (playing) {
        [[maybe_unused]] uint32_t hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW);
-        VBAM_CHECK(hr == 0);
+        assert(hr == 0);
        playing = false;
    }
 }
@@ -429,7 +434,7 @@ void FAudio_Output::resume() {

    if (!playing) {
        [[maybe_unused]] int32_t hr = FAudioSourceVoice_Start(sVoice, 0, FAUDIO_COMMIT_NOW);
-        VBAM_CHECK(hr == 0);
+        assert(hr == 0);
        playing = true;
    }
 }
@@ -440,7 +445,7 @@ void FAudio_Output::reset() {

    if (playing) {
        [[maybe_unused]] uint32_t hr = FAudioSourceVoice_Stop(sVoice, 0, FAUDIO_COMMIT_NOW);
-        VBAM_CHECK(hr == 0);
+        assert(hr == 0);
    }

    FAudioSourceVoice_FlushSourceBuffers(sVoice);
@@ -457,7 +462,7 @@ void FAudio_Output::setThrottle(unsigned short throttle_) {

    [[maybe_unused]] uint32_t hr =
        FAudioSourceVoice_SetFrequencyRatio(sVoice, (float)throttle_ / 100.0f, FAUDIO_COMMIT_NOW);
-    VBAM_CHECK(hr == 0);
+    assert(hr == 0);
 }

 }  // namespace
@@ -484,11 +489,8 @@ std::vector<AudioDevice> GetFAudioDevices() {
    }

    std::vector<AudioDevice> devices;
-#if defined(__WXMSW__)
-    // Add a separate default device on Windows.
    devices.reserve(dev_count + 1);
    devices.push_back({_("Default device"), wxEmptyString});
-#endif

    for (uint32_t i = 0; i < dev_count; i++) {
        FAudioDeviceDetails dd;
@@ -497,9 +499,9 @@ std::vector<AudioDevice> GetFAudioDevices() {
            continue;
        }

-        // Convert to UTF-8.
-        const wxString display_name = config::utf16_to_utf8(dd.DisplayName);
-        const wxString device_id = config::utf16_to_utf8(dd.DeviceID);
+        const wxString display_name(reinterpret_cast<wchar_t*>(dd.DisplayName));
+        const wxString device_id(reinterpret_cast<wchar_t*>(dd.DeviceID));
+
        devices.push_back({display_name, device_id});
    }

--- a/src/wx/audio/internal/openal.cpp
+++ b/src/wx/audio/internal/openal.cpp
@@ -30,12 +30,13 @@ typedef ALCboolean(ALC_APIENTRY* LPALCISEXTENSIONPRESENT)(ALCdevice* device,
 typedef const ALCchar*(ALC_APIENTRY* LPALCGETSTRING)(ALCdevice* device, ALCenum param);
 #endif

+#include <cassert>
+
 #include <wx/arrstr.h>
 #include <wx/log.h>
 #include <wx/translation.h>
 #include <wx/utils.h>

-#include "core/base/check.h"
 #include "core/gba/gbaGlobals.h"
 #include "core/gba/gbaSound.h"
 #include "wx/config/option-proxy.h"
@@ -46,7 +47,7 @@ namespace internal {
 namespace {

 // Debug
-#define ASSERT_SUCCESS VBAM_CHECK(AL_NO_ERROR == alGetError())
+#define ASSERT_SUCCESS assert(AL_NO_ERROR == alGetError())

 #ifndef LOGALL
 // replace logging functions with comments
@@ -170,7 +171,7 @@ void OpenAL::debugState() {

 bool OpenAL::init(long sampleRate) {
    winlog("OpenAL::init\n");
-    VBAM_CHECK(initialized == false);
+    assert(initialized == false);

    const wxString& audio_device = OPTION(kSoundAudioDevice);
    if (!audio_device.empty()) {
@@ -190,9 +191,9 @@ bool OpenAL::init(long sampleRate) {
    }

    context = alcCreateContext(device, nullptr);
-    VBAM_CHECK(context != nullptr);
+    assert(context != nullptr);
    ALCboolean retVal = alcMakeContextCurrent(context);
-    VBAM_CHECK(ALC_TRUE == retVal);
+    assert(ALC_TRUE == retVal);
    alGenBuffers(OPTION(kSoundBuffers), buffer);
    ASSERT_SUCCESS;
    alGenSources(1, &source);
@@ -337,7 +338,7 @@ void OpenAL::write(uint16_t* finalWave, int length) {
                return;
        }

-        VBAM_CHECK(nBuffersProcessed > 0);
+        assert(nBuffersProcessed > 0);

        // unqueue buffer
        tempBuffer = 0;
--- a/src/wx/audio/internal/xaudio2.h
+++ b/src/wx/audio/internal/xaudio2.h
@@ -1,6 +1,10 @@
 #ifndef WX_AUDIO_INTERNAL_XAUDIO2_H_
 #define WX_AUDIO_INTERNAL_XAUDIO2_H_

+#if !defined(VBAM_ENABLE_FAUDIO)
+#error "This file should only be included if FAudio is enabled"
+#endif
+
 #include "wx/audio/audio.h"

 namespace audio {
--- a/src/wx/autoupdater/autoupdater.h
+++ b/src/wx/autoupdater/autoupdater.h
@@ -1,8 +1,8 @@
-#ifndef VBAM_WX_AUTOUPDATER_AUTOUPDATER_H_
-#define VBAM_WX_AUTOUPDATER_AUTOUPDATER_H_
+#ifndef AUTOUPDATER_H
+#define AUTOUPDATER_H

 void initAutoupdater();
 void checkUpdatesUi();
 void shutdownAutoupdater();

-#endif // VBAM_WX_AUTOUPDATER_AUTOUPDATER_H_
+#endif // AUTOUPDATER_H
--- a/src/wx/autoupdater/macos/autoupdater.cpp
+++ b/src/wx/autoupdater/macos/autoupdater.cpp
@@ -1,6 +1,5 @@
-#include "wx/autoupdater/autoupdater.h"
-
-#include "wx/autoupdater/macos/sparkle-wrapper.h"
+#include "../autoupdater.h"
+#include "sparkle-wrapper.h"

 SparkleWrapper autoupdater;

--- a/src/wx/autoupdater/macos/sparkle-wrapper.h
+++ b/src/wx/autoupdater/macos/sparkle-wrapper.h
@@ -1,5 +1,5 @@
-#ifndef VBAM_WX_AUTOUPDATER_MACOS_SPARKLE_WRAPPER_H_
-#define VBAM_WX_AUTOUPDATER_MACOS_SPARKLE_WRAPPER_H_
+#ifndef SPARKLE_WRAPPER_H
+#define SPARKLE_WRAPPER_H

 class SparkleWrapper
 {
@@ -14,4 +14,4 @@ class SparkleWrapper
    Private* d;
 };

-#endif // VBAM_WX_AUTOUPDATER_MACOS_SPARKLE_WRAPPER_H_
+#endif // SPARKLE_WRAPPER_H
--- a/src/wx/autoupdater/wxmsw/autoupdater.cpp
+++ b/src/wx/autoupdater/wxmsw/autoupdater.cpp
@@ -1,13 +1,14 @@
-#include "wx/autoupdater/autoupdater.h"
+#include "../autoupdater.h"

 #include "core/base/version.h"
-#include "wx/autoupdater/wxmsw/winsparkle-wrapper.h"
+#include "../../strutils.h"
+#include "winsparkle-wrapper.h"


 void initAutoupdater()
 {
    // even if we are a nightly, only check latest stable version
-    const wxString version(kVbamMainVersion);
+    wxString version = strutils::split(kVbamVersion, '-')[0];
 #ifndef NO_HTTPS
    win_sparkle_set_appcast_url("https://data.visualboyadvance-m.org/appcast.xml");
 #else
--- a/src/wx/autoupdater/wxmsw/winsparkle-wrapper.cpp
+++ b/src/wx/autoupdater/wxmsw/winsparkle-wrapper.cpp
@@ -1,13 +1,12 @@
-#include "wx/autoupdater/wxmsw/winsparkle-wrapper.h"
-
 #include <cstdio>
+#include <string>
+#include <stdexcept>

-#include <wx/file.h>
-#include <wx/filename.h>
-#include <wx/msw/private.h>
 #include <wx/utils.h>
+#include "wx/wxvbam.h"
+#include "winsparkle-wrapper.h"
+#include "wx/msw/private.h"

-#include "wx/autoupdater/wxmsw/winsparkle-rc.h"

 WinSparkleDllWrapper *WinSparkleDllWrapper::GetInstance()
 {
--- a/src/wx/autoupdater/wxmsw/winsparkle-wrapper.h
+++ b/src/wx/autoupdater/wxmsw/winsparkle-wrapper.h
@@ -4,6 +4,8 @@
 #include <wx/string.h>
 #include <wx/dynlib.h>

+#include "winsparkle-rc.h"
+
 class WinSparkleDllWrapper {
 public:
    static WinSparkleDllWrapper *GetInstance();
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -11,7 +11,6 @@
 #include <wx/msgdlg.h>

 #include "components/filters_interframe/interframe.h"
-#include "core/base/check.h"
 #include "core/base/version.h"
 #include "core/gb/gb.h"
 #include "core/gb/gbCheats.h"
@@ -23,7 +22,6 @@
 #include "core/gba/gbaGlobals.h"
 #include "core/gba/gbaPrint.h"
 #include "core/gba/gbaSound.h"
-#include "wx/config/cmdtab.h"
 #include "wx/config/option-proxy.h"
 #include "wx/config/option.h"
 #include "wx/dialogs/game-maker.h"
@@ -31,9 +29,14 @@
 #define GetXRCDialog(n) \
    wxStaticCast(wxGetApp().frame->FindWindowByName(n), wxDialog)

+bool cmditem_lt(const struct cmditem& cmd1, const struct cmditem& cmd2)
+{
+    return wxStrcmp(cmd1.cmd, cmd2.cmd) < 0;
+}
+
 void MainFrame::GetMenuOptionBool(const wxString& menuName, bool* field)
 {
-    VBAM_CHECK(field);
+    assert(field);
    *field = !*field;
    int id = wxXmlResource::GetXRCID(menuName);

@@ -49,7 +52,7 @@ void MainFrame::GetMenuOptionBool(const wxString& menuName, bool* field)
 void MainFrame::GetMenuOptionConfig(const wxString& menu_name,
                                    const config::OptionID& option_id) {
    config::Option* option = config::Option::ByID(option_id);
-    VBAM_CHECK(option);
+    assert(option);

    int id = wxXmlResource::GetXRCID(menu_name);
    for (size_t i = 0; i < checkable_mi.size(); i++) {
@@ -65,7 +68,7 @@ void MainFrame::GetMenuOptionConfig(const wxString& menu_name,
                option->SetInt(is_checked);
                break;
            default:
-                VBAM_CHECK(false);
+                assert(false);
                return;
        }
        break;
@@ -74,7 +77,7 @@ void MainFrame::GetMenuOptionConfig(const wxString& menu_name,

 void MainFrame::GetMenuOptionInt(const wxString& menuName, int* field, int mask)
 {
-    VBAM_CHECK(field);
+    assert(field);
    int value = mask;
    bool is_checked = ((*field) & (mask)) != (value);
    int id = wxXmlResource::GetXRCID(menuName);
@@ -126,7 +129,7 @@ static void toggleBitVar(bool *menuValue, int *globalVar, int mask)
 EVT_HANDLER(wxID_OPEN, "Open ROM...")
 {
    static int open_ft = 0;
-    const wxString gba_rom_dir = OPTION(kGBAROMDir);
+    const wxString& gba_rom_dir = OPTION(kGBAROMDir);

    // FIXME: ignore if non-existent or not a dir
    wxString pats = _(
@@ -158,7 +161,7 @@ EVT_HANDLER(wxID_OPEN, "Open ROM...")
 EVT_HANDLER(OpenGB, "Open GB...")
 {
    static int open_ft = 0;
-    const wxString gb_rom_dir = OPTION(kGBROMDir);
+    const wxString& gb_rom_dir = OPTION(kGBROMDir);

    // FIXME: ignore if non-existent or not a dir
    wxString pats = _(
@@ -185,7 +188,7 @@ EVT_HANDLER(OpenGB, "Open GB...")
 EVT_HANDLER(OpenGBC, "Open GBC...")
 {
    static int open_ft = 0;
-    const wxString gbc_rom_dir = OPTION(kGBGBCROMDir);
+    const wxString& gbc_rom_dir = OPTION(kGBGBCROMDir);

    // FIXME: ignore if non-existent or not a dir
    wxString pats = _(
@@ -362,7 +365,7 @@ EVT_HANDLER_MASK(SetLoadingDotCodeFile, "Load e-Reader Dot Code...", CMDEN_GBA)
    static wxString loaddotcodefile_path;
    wxFileDialog dlg(this, _("Select Dot Code file"), loaddotcodefile_path, wxEmptyString,
        _(
-                         "E-Reader Dot Code (*.bin;*.raw)|"
+                         "e-Reader Dot Code (*.bin;*.raw)|"
                         "*.bin;*.raw"),
        wxFD_OPEN | wxFD_FILE_MUST_EXIST);
    int ret = ShowModal(&dlg);
@@ -384,7 +387,7 @@ EVT_HANDLER_MASK(SetSavingDotCodeFile, "Save e-Reader Dot Code...", CMDEN_GBA)
    static wxString savedotcodefile_path;
    wxFileDialog dlg(this, _("Select Dot Code file"), savedotcodefile_path, wxEmptyString,
        _(
-                         "E-Reader Dot Code (*.bin;*.raw)|"
+                         "e-Reader Dot Code (*.bin;*.raw)|"
                         "*.bin;*.raw"),
        wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
    int ret = ShowModal(&dlg);
@@ -1990,7 +1993,7 @@ EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
        XRCCTRL(*dlg, "GameCode", wxControl)
            ->SetLabel(s);
        cmt = wxString((const char*)&g_rom[0xa0], wxConvLibc, 12);
-        wxFileConfig* cfg = wxGetApp().overrides_.get();
+        wxFileConfig* cfg = wxGetApp().overrides;

        if (cfg->HasGroup(s)) {
            cfg->SetPath(s);
@@ -2024,7 +2027,7 @@ EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
    if (panel->game_type() == IMAGE_GBA) {
        agbPrintEnable(OPTION(kPrefAgbPrint));
        wxString s = wxString((const char*)&g_rom[0xac], wxConvLibc, 4);
-        wxFileConfig* cfg = wxGetApp().overrides_.get();
+        wxFileConfig* cfg = wxGetApp().overrides;
        bool chg;

        if (cfg->HasGroup(s)) {
@@ -2171,7 +2174,7 @@ EVT_HANDLER(EmulatorDirectories, "Directories...")
 EVT_HANDLER(JoypadConfigure, "Joypad options...")
 {
    if (ShowModal(GetXRCDialog("JoypadConfig")) == wxID_OK) {
-        update_shortcut_opts();
+        update_joypad_opts();
    }
 }

@@ -2219,7 +2222,7 @@ EVT_HANDLER(FAQ, "VBA-M support forum")

 EVT_HANDLER(Translate, "Translations")
 {
-    wxLaunchDefaultBrowser(wxT("https://explore.transifex.com/bgk/vba-m/"));
+    wxLaunchDefaultBrowser(wxT("http://www.transifex.com/projects/p/vba-m"));
 }

 // was About
@@ -2297,7 +2300,7 @@ EVT_HANDLER(RetainAspect, "Retain aspect ratio when resizing")

 EVT_HANDLER(Printer, "Enable printer emulation")
 {
-    GetMenuOptionInt("Printer", &coreOptions.gbPrinterEnabled, 1);
+    GetMenuOptionInt("Printer", &coreOptions.winGbPrinterEnabled, 1);
 #if (defined __WIN32__ || defined _WIN32)
 #ifndef NO_LINK
    gbSerialFunction = gbStartLink;
@@ -2305,7 +2308,7 @@ EVT_HANDLER(Printer, "Enable printer emulation")
    gbSerialFunction = NULL;
 #endif
 #endif
-    if (coreOptions.gbPrinterEnabled)
+    if (coreOptions.winGbPrinterEnabled)
        gbSerialFunction = gbPrinterSend;

    update_opts();
--- a/Show More
+++ b/Show More