translations: transifex pull

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

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: rkitover

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: VBA-M Forum
-    url: https://board.vba-m.com/
+    url: https://board.visualboyadvance-m.org/
     about: For general questions and support please join our forum or our
   - name: VBA-M IRC Channel
     url: https://web.libera.chat/#vba-m

.github/ISSUE_TEMPLATE/feature.yml

@@ -14,7 +14,7 @@ body:
   - type: markdown
     attributes:
       value: |
-            Please try a nightly build from: https://nightly.vba-m.com to see if your idea has already been implemented.
+            Please try a nightly build from: https://nightly.visualboyadvance-m.org 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

.github/workflows/devkitpro-build.yml

@@ -0,0 +1,34 @@
+name: Libretro Devkitpro
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+#        target_name: [ngc, wii, wiiu, switch]
+        target_name: [ngc, wii, wiiu]
+        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 }}

.github/workflows/macos-build.yml

@@ -1,27 +1,63 @@
-name: macOS Latest Build
+name: macOS Latest
 on: [push, pull_request]
-#on: workflow_dispatch
 
 jobs:
   build:
     strategy:
       matrix:
-        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
-        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
+        build_type: [release, debug]
+        build_options: [default, link_off, translations_only, libretro]
+        include:
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Release'
+            build_type: release
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Debug'
+            build_type: debug
+          - cmake_options: '-DENABLE_LINK=OFF'
+            build_options: link_off
+          - cmake_options: '-DTRANSLATIONS_ONLY=ON'
+            build_options: translations_only
+          - libretro_build: 'DEBUG=0'
+            build_type: release
+            build_options: libretro
+          - libretro_build: 'DEBUG=1'
+            build_type: debug
+            build_options: libretro
+        exclude:
+          # Exclude debug/translations_only build
+          - build_type: debug
+            build_options: translations_only
     runs-on: macos-latest
+    env:
+      NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
       - name: Install nix
         uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - name: Configure
+
+      # Cmake build
+      - if: matrix.build_options != 'libretro'
+        name: Configure CMake
         run: >-
-          nix-shell --command 'cmake -B build -G Ninja ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}'
-      - name: Build
+          nix-shell --command 'cmake -B build -G Ninja ${{ matrix.cmake_build }} -DENABLE_LTO=OFF ${{ matrix.cmake_options }}'
+      - if: matrix.build_options != 'libretro'
+        name: Build
         run: >-
           nix-shell --command 'ninja -C build'
+
+      # Libretro build
+      - if: matrix.build_options == 'libretro'
+        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'

.github/workflows/msys2-build.yml

@@ -1,12 +1,31 @@
-name: MSYS2 Build
+name: MSYS2
 on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
-        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
+        build_type: [release, debug]
+        build_options: [default, link_off, translations_only, libretro]
+        include:
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Release'
+            build_type: release
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Debug'
+            build_type: debug
+          - cmake_options: '-DENABLE_LINK=OFF'
+            build_options: link_off
+          - cmake_options: '-DTRANSLATIONS_ONLY=ON'
+            build_options: translations_only
+          - libretro_build: 'DEBUG=0'
+            build_type: release
+            build_options: libretro
+          - libretro_build: 'DEBUG=1'
+            build_type: debug
+            build_options: libretro
+        exclude:
+          # Exclude debug/translations_only build
+          - build_type: debug
+            build_options: translations_only
     runs-on: windows-latest
     env:
       MSYSTEM: CLANG64
@@ -16,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
       - name: Setup msys2
@@ -27,11 +46,19 @@ jobs:
       - name: Install deps
         run: >-
           bash installdeps
-      - name: Configure
-        run: >-
-          cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
-      - name: Build
-        run: ninja -C build
 
-      - name: Install
+      # CMake build
+      - if: matrix.build_options != 'libretro'
+        name: Configure CMake
+        run: cmake -B build -G Ninja ${{ matrix.cmake_build }} -DENABLE_LTO=OFF ${{ matrix.cmake_options }}
+      - if: matrix.build_options != 'libretro'
+        name: Build
+        run: ninja -C build
+      - if: matrix.build_options != 'libretro'
+        name: Install
         run: ninja -C build install
+
+      # Libretro build
+      - if: matrix.build_options == 'libretro'
+        name: Build libretro core
+        run: make -C src/libretro ${{ matrix.libretro_build }} CC=clang CXX=clang++

.github/workflows/ubuntu-build.yml

@@ -1,30 +1,77 @@
-name: Ubuntu Latest Build
+name: Ubuntu Latest
 on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        cmake_compiler: ['-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++', '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++']
-        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
-        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
+        build_compiler: [gcc, clang]
+        build_type: [release, debug]
+#        build_options: [default, link_off, translations_only, libretro]
+        build_options: [default, link_off, translations_only]
+        include:
+          - cmake_compiler: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++'
+            build_compiler: gcc
+          - cmake_compiler: '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++'
+            build_compiler: clang
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Release'
+            build_type: release
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Debug'
+            build_type: debug
+          - cmake_options: '-DENABLE_LINK=OFF'
+            build_options: link_off
+          - cmake_options: '-DTRANSLATIONS_ONLY=ON'
+            build_options: translations_only
+#          - libretro_build: 'DEBUG=0'
+#            build_type: release
+#            build_options: libretro
+#          - libretro_build: 'DEBUG=1'
+#            build_type: debug
+#            build_options: libretro
+        exclude:
+          # Exclude debug/translations_only build
+          - build_type: debug
+            build_options: translations_only
+          - build_type: release
+            build_options: translations_only
+            build_compiler: clang
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
 
       - name: Install Dependencies
-        run: >-
-          bash installdeps; if [ "${{ matrix.compiler }}" = clang ]; then sudo apt -y install clang; fi
+        run: |
+          sudo add-apt-repository ppa:hrzhu/sdl3-backport
+          sudo apt update
+          bash installdeps
+          if [ "${{ matrix.build_compiler }}" = clang ]; then
+            sudo apt -y install clang
+          fi
 
-      - name: Configure
+      - name: Install xvfb
+        run: sudo apt -y install xvfb
+
+      # CMake build
+      - if: matrix.build_options != 'libretro'
+        name: Configure CMake
         run: >-
           cmake -B build -G Ninja ${{ matrix.cmake_compiler }} ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
-
-      - name: Build
+      - if: matrix.build_options != 'libretro'
+        name: Build
         run: ninja -C build
-
-      - name: Install
+      - if: matrix.build_options != 'libretro'
+        name: Install
         run: sudo ninja -C build install
+
+      # Libretro build
+#      - if: matrix.build_options == 'libretro'
+#        name: Build libretro core
+#        run: make -C src/libretro ${{ matrix.libretro_build }}
+
+      # Run tests
+      - if: matrix.build_options == 'default'
+        name: Run tests
+        run: cd build && xvfb-run ctest -j --output-on-failure

.github/workflows/visual-studio-build.yml

@@ -1,36 +1,60 @@
-name: Visual Studio Build
+name: Visual Studio
 on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        msvc_arch: ['x64', 'x64_x86']
+        msvc_arch: ['x64', 'amd64_x86', 'amd64_arm64']
+        # TODO: Re-add "Visual Studio 17 2022" once it's working.
         cmake_generator: ['Ninja']
-#        cmake_generator: ['Ninja', '"Visual Studio 17 2022"']
-        cmake_build: ['-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Debug']
-        cmake_options: ['', '-DENABLE_LINK=OFF', '-DENABLE_SDL=ON']
+        build_type: [release, debug]
+        build_options: [default, link_off, translations_only]
+        include:
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Release'
+            build_type: release
+          - cmake_build: '-DCMAKE_BUILD_TYPE=Debug'
+            build_type: debug
+          - cmake_options: '-DENABLE_LINK=OFF'
+            build_options: link_off
+          - cmake_options: '-DTRANSLATIONS_ONLY=ON'
+            build_options: translations_only
+          - cmake_vcpkg_triplet: 'x64-windows-static'
+            msvc_arch: x64
+          - cmake_vcpkg_triplet: 'x86-windows-static'
+            msvc_arch: amd64_x86
+          - cmake_vcpkg_triplet: 'arm64-windows-static'
+            msvc_arch: amd64_arm64
+        exclude:
+          # Exclude debug/translations_only build
+          - build_type: debug
+            build_options: translations_only
+          - build_type: release
+            build_options: translations_only
+            msvc_arch: amd64_x86
+          - build_type: release
+            build_options: translations_only
+            msvc_arch: amd64_arm64
     runs-on: windows-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Prepare Visual Studio environment
-        uses: ilammy/msvc-dev-cmd@v1.12.0
+        uses: ilammy/msvc-dev-cmd@v1.13.0
         with:
           arch: ${{ matrix.msvc_arch }}
 
-      - name: Configure (x64)
-        if: matrix.msvc_arch == 'x64'
+      - name: Configure
         run: >-
-          cmake -B build -G ${{ matrix.cmake_generator }} -DVCPKG_TARGET_TRIPLET=x64-windows-static ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
-
-      - name: Configure (x86)
-        if: matrix.msvc_arch == 'x64_x86'
-        run: >-
-          cmake -B build -G ${{ matrix.cmake_generator }} -DVCPKG_TARGET_TRIPLET=x86-windows-static ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
+          cmake -B build -G ${{ matrix.cmake_generator }} -DVCPKG_TARGET_TRIPLET=${{ matrix.cmake_vcpkg_triplet }} ${{ matrix.cmake_build }} ${{ matrix.cmake_options }}
 
       - 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

.gitignore

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

.gitlab-ci.yml

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

.gitmodules

@@ -1,4 +1,6 @@
-[submodule "dependencies"]
-	path = dependencies
-	url = https://github.com/visualboyadvance-m/dependencies.git
-	branch = master
+[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

CHANGELOG.md

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

DEVELOPER-MANUAL.md

@@ -9,17 +9,15 @@
     - [Commit Message](#commit-message)
     - [Collaboration on a Branch](#collaboration-on-a-branch)
     - [Commits from Maintainers](#commits-from-maintainers)
-  - [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)
+  - [Miscellaneous](#miscellaneous)
+    - [Debug Messages](#debug-messages)
   - [Release Process](#release-process)
-    - [Environment](#environment)
+    - [Certificates](#certificates)
     - [Release Commit and Tag](#release-commit-and-tag)
     - [64-bit Windows Binary](#64-bit-windows-binary)
     - [32-bit Windows Binary](#32-bit-windows-binary)
-    - [64-bit Mac Binary](#64-bit-mac-binary)
+    - [ARM64 Windows Binary](#arm64-windows-binary)
+    - [macOS Binary](#macos-binary)
     - [Final steps](#final-steps)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -35,6 +33,8 @@ setup guides.
 
 Follow the following steps to process newly submitted issues:
 
+- Edit the user's post to remove any links to illegal content such as ROM files.
+
 - Edit the user's post to remove unused template sections etc.. Rephrase the
   issue title if it needs to be clarified.
 
@@ -50,14 +50,15 @@ Follow the following steps to process newly submitted issues:
 
 #### Resolving Issues
 
-- An issue is resolved by closing it in github. A commit that fixes the issue
+- An issue is resolved by closing it in GitHub. A commit that fixes the issue
   should have the following line near the end of the body of the commit message:
 ```
-- Fix #999.
+Fix #999.
 ```
   This will automatically close the issue and assign the closing commit in the
-  github metadata when it is merged to master. The issue can be reopened if
+  GitHub metadata when it is merged to master. The issue can be reopened if
   needed.
+
 - A commit that is work towards resolving an issue, should have the issue number
   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.
@@ -70,7 +71,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
@@ -84,28 +85,29 @@ A commit message must always have a title and a description, the description
 must be independent of the title line, if necessary repeat the information in
 the title line in the description.
 
-Make sure the git history in your branch is clean and logical, edit when
-necessary with `rebase -i`.
-
-Use one commit per logical change if necessary, most work can be squashed into
-one commit when you are done. It is not necessary to have separate commits
-per-file if they are one logical change. We are less strict about this than
-other projects, fewer is better.
+The commit message must **ALL** changes, unless it's a minor refactor or
+white space change or something and is not important.
 
 The commit title line should be prefixed with an area, unless it involves the
 wxWidgets GUI app, in which case it should **NOT** have a prefix.
 
+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 otherwise:
+Please use one of these area prefixes for non-main-GUI-app commits:
 
-- doc: documentation, README.md etc.
-- 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-app: anything for the SDL app
-- translations: anything related to translations
+- doc: documentation, README.md etc..
+- build: CMake, installdeps, preprocessor compatibility defines, compatibility
+  headers, macOS build system etc..
+- gb: the GameBoy emulator core or changes related to it.
+- gba: the GameBoy Advance emulator core or changes related to it.
+- libretro: the libretro core glue and build.
+- sdl: anything for the SDL port, but **NOT** SDL functionality in the wxWidgets
+  GUI app.
+- translations: anything related to translations.
 
 . Add other areas here if needed.
 
@@ -114,21 +116,85 @@ If a commit fixes a regression, use a title line such as:
 ```console
 Fix regression <PROBLEM> in <SHORT-SHA>
 ```
-, you can get the short sha from `git log --oneline -100` or similar.
+, you can get the short SHA from `git log --oneline -100` or similar.
 
 The commit description for a regression must refer to the breaking change in
 reference format, which you can get from e.g. `git log --format=reference -20`.
 
-You can refer to github issues using `#<ISSUE-NUMBER>` freely in the description
-text.
+#### Working on Pull Requests
 
-If a commit fixes an issue, add a line at the end of the description such as:
+When opening a pull request, push your branch to our repository if you were
+given access, or a branch in your fork if you have not yet been given access. Do
+**NOT** use `master`, use a specific branch.
 
-```console
-Fix #<ISSUE-NUMBER>.
+If you are using a fork, set up your workflow like this:
+
+```bash
+git clone git@github.com:visualboyadvance-m/visualboyadvance-m
+git remote add fork git@github.com:<your-GitHub-user>/visualboyadvance-m
+git fetch --all --prune
+git checkout -b your-work-branch-name
+git commit -a --verbose --signoff -S
 ```
 .
 
+The `-S` flags tells Git to sign your commit with GnuPG. If you do not have a
+GnuPG key, you will need to create one and upload it to a keyserver. I recommend
+removing the password on your private key to not deal with `gpg-agent` and all
+of this stuff.
+
+All of this works fine on Windows, just install `GnuPG.GnuPG` from WinGet.
+
+Your first push will then be:
+
+```bash
+git push -u fork HEAD
+```
+.
+
+Subsequent commits will then be:
+
+```bash
+git commit -a --verbose --amend --reset-author --signoff -S
+git push -f
+```
+
+. If you are a project member, then the workflow will be roughly:
+
+```bash
+git clone git@github.com:visualboyadvance-m/visualboyadvance-m
+git fetch --all --prune
+git checkout -b your-work-branch-name
+git commit -a --verbose --signoff -S
+```
+
+. Your first push will be:
+
+```bash
+git push -u origin HEAD
+```
+
+. And subsequent pushes will be:
+
+```bash
+git commit -a --verbose --signoff -S --amend --reset-author
+git push -f
+```
+
+. Please push frequently so that we can track your progress and review it.
+
+Make sure the git history in your branch is clean and logical, edit when
+necessary with `rebase -i`. In most cases a single commit with all of the
+changes will be good. Sometimes you may want to split it up into multiple
+logical commits for a large work, but a single commit is also fine if the title
+line encapsulates all of the work for the changelog.
+
+See the previous section on how to write commit messages.
+
+If you are using Windows as your development environment, I recommend reading my
+manual on Windows development environments
+[here](https://github.com/rkitover/windows-dev-guide).
+
 #### Collaboration on a Branch
 
 To update when multiple people are working on a git branch, keep a couple of
@@ -138,137 +204,103 @@ 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 (very rudely you might say) did a `push -f`, `pull
-  --rebase` will **USUALLY** work. Verify the log, and if necessary do this
-  instead:
+- To update when someone else updated the branch with a `git push -f`:
 
 ```bash
 git status # should be clean, with your work having been already pushed
 git fetch --all --prune
-git reset --hard origin/<branch-name>
+git reset --hard origin/<work-branch-name>
+```
+.
+
+- While actively working on a branch, keep it rebased on top of master, like
+  this:
+
+```bash
+git fetch --all --prune
+git rebase origin/master
+git push -f
 ```
 
-While actively working on a branch, keep it rebased on top of master.
+. You may sometimes need to fix conflicts, follow the instructions.
 
-#### Commits from Maintainers
+#### Commits from Admins
 
-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.
+Maintainers and project members have the power to commit directly to master.
+This power must be used responsibly.
 
-Make your most earnest attempt to follow these general guidelines to keep our
-history clean:
+Make your best attempt to follow these general guidelines:
 
-- Things that are a straight fix or improvement that does not require discussion
+- Things that are a minor 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.
-  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.
+- Absolutely **NEVER** `git push -f` on `master`. If you make a mistake, revert
+  or push a fix commit.
 
-
-### Strings, Character Sets and Translations
-
-#### Pulling Updated Translations
-
-Once in a while it is necessary to pull new and updated translations from
-transifex.
-
-For this you need the transifex client, available for Windows as well from
-chocolatey as `transifex-client`.
-
-To pull translations run:
+- 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. Once the CI is clear, you can merge your branch like
+  this:
 
 ```bash
-tx pull -af
-```
-
-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 -f
+git checkout master
+git merge --ff-only <your-work-branch-name>
 git push
+git branch -D <your-work-branch-name>
+git push origin ':refs/heads/your-work-branch-nbame'
 ```
 
-#### Translations Message Catalog
+. The last line there deletes the branch in our repository.
 
-Strings that need to be translated by our wonderful translators on transifex
-(thank you guys very much) need to be enclosed in `_("...")`, for example:
+### Miscellaneous
+
+#### Debug Messages
+
+We have an override for `wxLogDebug()` to make it work even in non-debug builds
+of wxWidgets and on windows, even in mintty.
+
+It works like `printf()`, e.g.:
 
 ```cpp
-wxLogError(_("error: something very wrong"));
+int foo = 42;
+wxLogDebug(wxT("the value of foo = %d"), foo);
 ```
 
-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:
+From the core etc. the usual:
 
 ```cpp
-fprintf(STDERR, "Error: %s\n", UTF8(err_msg));
+fprintf(stderr, "...", ...);
 ```
+, will work fine.
 
-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
+You need a debug build for this to work or to even have a console on Windows.
+Pass `-DCMAKE_BUILD_TYPE=Debug` to CMake.
 
 ### Release Process
 
-#### Environment
+#### GnuPG Key
 
-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.
+You will need to create a GnuPG key for signing your commits and release tags,
+and upload it to a keyserver.
 
-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.
+Make sure to install GnuPG on all environments where you will be making commits
+and tags.
 
-For codesigning windows binaries, put your certificate into
-`~/.codesign/windows_comodo.pkcs12`.
+#### Certificates
 
-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.
+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`.
 
 #### Release Commit and Tag
 
@@ -280,8 +312,10 @@ tag:
 mkdir build && cd build
 cmake .. -DTAG_RELEASE=TRUE
 ```
+, follow the instructions to edit the `CHANGELOG.md` and then push the release:
 
-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.
 
 ```bash
 git push
@@ -296,84 +330,126 @@ cmake .. -DTAG_RELEASE=UNDO
 
 #### 64-bit Windows Binary
 
-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.
+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.
 
 ```powershell
-mkdir build
-cd build
-cmake .. -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
+mkdir build-msvc64
+cd build-msvc64
+cmake .. -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
 ninja
 ```
 
 Collect the following files for the release:
 
-- `visualboyadvance-m-Win-64bit.zip`
-- `visualboyadvance-m-Win-64bit.zip.asc`
+- `visualboyadvance-m-Win-x86_64.zip`
 - `translations.zip`
-- `translations.zip.asc`
+
+Repeat the process for the debug build, with `-DCMAKE_BUILD_TYPE=Debug` and
+collect this file:
+
+- `visualboyadvance-m-Win-x86_64-debug.zip`
+.
 
 #### 32-bit Windows Binary
 
-For this the optimal environment is a linux distribution with the mingw
-toolchain, I use fedora.
+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.
 
-You can set up a shell on a fedora distribution with docker as described here:
+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.
 
-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/
+First install dependencies with:
 
 ```bash
-sh tools/win/linux-cross-builder -32
+./installdeps
 ```
-
-You can also use msys2 on Windows, this is not recommended:
+. Then build the 32-bit binary as follows:
 
 ```bash
-sh tools/win/msys2-builder -32
+mkdir build-mingw32
+cd build-mingw32
+cmake .. -DCMAKE_BUILD_TYPE=Release -DUPSTREAM_RELEASE=TRUE -G Ninja
+ninja
 ```
+. Collect this file for the release:
 
-To set up msys2, see this guide:
+- `visualboyadvance-m-Win-x86_32.zip`
 
-https://gist.github.com/rkitover/d008324309044fc0cc742bdb16064454
+. Then repeat the process for the debug build with `-DCMAKE_BUILD_TYPE=Debug`,
+and collect this file:
 
-Collect the following files from `~/vbam-build-mingw32/project` if using linux,
-or `~/vbam-build-msys2-x86_64/project` if using msys2:
+- `visualboyadvance-m-Win-x86_32-debug.zip`
+.
 
-- `visualboyadvance-m-Win-32bit.zip`
-- `visualboyadvance-m-Win-32bit.zip.asc`
+#### ARM64 Windows Binary
 
-#### 64-bit Mac Binary
+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
 
 Install the latest Xcode for your OS.
 
-You will need bash and (optionally) gpg from homebrew (which you will also need
-to install):
-
-```bash
-brew install bash gnupg
-```
+You will need bash from Homebrew/nix/MacPorts/whatever to run the build script.
 
 You will need a codesigning certificate from Apple, which you will be able to
-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.
+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`:
 
 ```bash
-/usr/local/bin/bash tools/osx/builder -64
+security unlock-keychain -p "$(cat ~/.login-keychain-password)" login.keychain
 ```
+, 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-64bit.zip`
-- `visualboyadvance-m-Mac-64bit.zip.asc`
+- `visualboyadvance-m-Mac-x86_64.zip`
+- `visualboyadvance-m-Mac-x86_64-debug.zip`
+.
 
 #### Final steps
 
@@ -381,27 +457,26 @@ 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 entries from `CHANGELOG.md` generated earlier from git by the release
-commit script.
+the generated entries from `CHANGELOG.md` you edited earlier.
 
 Upload all files collected during the earlier builds, the complete list is:
 
 
 - `translations.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`
+- `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`
 
-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.

README.md

@@ -3,11 +3,11 @@
 
 
 - [Visual Boy Advance - M](#visual-boy-advance---m)
+  - [System Requirements](#system-requirements)
   - [Building](#building)
   - [Building a Libretro core](#building-a-libretro-core)
   - [Visual Studio Support](#visual-studio-support)
   - [Visual Studio Code Support](#visual-studio-code-support)
-    - [Optional: clangd](#optional-clangd)
   - [Dependencies](#dependencies)
   - [Cross compiling for 32 bit on a 64 bit host](#cross-compiling-for-32-bit-on-a-64-bit-host)
   - [Cross Compiling for Win32](#cross-compiling-for-win32)
@@ -19,8 +19,6 @@
 
 <!-- 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
@@ -37,11 +35,11 @@ Chat](https://web.libera.chat/).
 
 Game Boy and Game Boy Advance Emulator
 
-The forums are [here](https://board.vba-m.com/).
+The forums are [here](https://board.visualboyadvance-m.org/).
 
 Windows and Mac builds are in the [releases tab](https://github.com/visualboyadvance-m/visualboyadvance-m/releases).
 
-Nightly builds for Windows and macOS are at [https://nightly.vba-m.com/](https://nightly.vba-m.com/).
+Nightly builds for Windows and macOS are at [https://nightly.visualboyadvance-m.org/](https://nightly.visualboyadvance-m.org/).
 
 **PLEASE TEST THE NIGHTLY OR MASTER WITH A FACTORY RESET BEFORE REPORTING
 ISSUES**
@@ -57,26 +55,41 @@ the `translations.zip` to the same directory as the executable.
 If you are having issues, try resetting the config file first, go to `Help ->
 Factory Reset`.
 
+## System Requirements
+
+Windows XP, Vista, 7, 8.1 or 10/11, Linux distros 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.
+
+- 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.
+
+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:
 
-```shell
+```bash
 cd ~ && mkdir src && cd src
 git clone https://github.com/visualboyadvance-m/visualboyadvance-m.git
 cd visualboyadvance-m
-./installdeps
 
-# ./installdeps will give you build instructions, which will be similar to:
+./installdeps # On Linux or macOS
 
-mkdir build && cd build
-cmake .. -G Ninja
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -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
 
@@ -87,7 +100,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
 
@@ -107,14 +120,16 @@ 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 command prompt, use something like this:
+To build in the Visual Studio `x64 Native Tools Command Prompt`, use something
+like this:
 
 ```
 mkdir build
 cd build
-cmake .. -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=Debug -G Ninja
+cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
 ninja
 ```
+.
 
 ## Visual Studio Code Support
 
@@ -149,10 +164,9 @@ And the following development libraries:
 - [zlib](https://zlib.net/) (required)
 - [mesa](https://mesa3d.org/) (if using X11 or any OpenGL otherwise)
 - [ffmpeg](https://ffmpeg.org/) (optional, at least version `4.0.4`, for game recording)
-- [gettext](https://www.gnu.org/software/gettext/) and gettext-tools (optional, with ENABLE_NLS)
+- [gettext](https://www.gnu.org/software/gettext/) and gettext-tools
 - [SDL2](https://www.libsdl.org/) (required)
-- [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)
+- [openal-soft](https://kcat.strangesoft.net/openal.html) (optional, a sound interface)
 - [wxWidgets](https://wxwidgets.org/) (required for GUI, 2.8 and non-stl builds are no longer supported)
 
 On Linux and similar, you also need the version of GTK your wxWidgets is linked
@@ -172,66 +186,47 @@ 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 .. -DENABLE_LINK=NO -G Ninja
+cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_LINK=NO -G Ninja
 ```
-
-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:
+. 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_NLS            | Enable translations                                                  | 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_OPENAL         | Enable OpenAL for the wxWidgets port                                 | AUTO                  |
-| ENABLE_SSP            | Enable gcc stack protector support (gcc only)                        | OFF                   |
-| 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                   |
-| SSP_STATIC            | Try to link static gcc stack protector library (gcc only)            | OFF except Win32      |
-| OPENAL_STATIC         | Try to link static OpenAL libraries                                  | OFF                   |
-| SSP_STATIC            | Link gcc stack protecter libssp statically (gcc, with ENABLE_SSP)    | 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                                     | 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_OPENAL`         | Enable openal-soft sound output for wxWidgets                        | ON, not 32 bit Win    |
+| `ENABLE_XAUDIO2`        | Enable xaudio2 sound output for wxWidgets (Windows only)             | ON                    |
+| `ENABLE_FAUDIO`         | Enable faudio sound output for wxWidgets,                            | ON, not 32 bit Win    |
+| `ENABLE_ASAN`           | Enable libasan sanitizers (by default address, only in debug mode)   | OFF                   |
+| `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                   |
 
 Note for distro packagers, we use the CMake module
 [GNUInstallDirs](https://cmake.org/cmake/help/v2.8.12/cmake.html#module:GNUInstallDirs)
@@ -241,52 +236,6 @@ 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
@@ -305,27 +254,25 @@ do something such as:
 ```shell
 ulimit -c unlimited
 ```
-
-in your shell to enable coredump files.
+, in your shell to enable core 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 Fedora Linux (and possibly other
-distributions.)
+explains how to retrieve core dump on some distributions, when they are managed
+by systemd.
 
-Once you have the core dump file, open it with `gdb`, for example:
+Once you have the core file, open it with `gdb`, for example:
 
 ```shell
 gdb -c core ./visualboyadvance-m
 ```
-
-In the `gdb` shell, to print the backtrace, type:
+. In the `gdb` shell, to start the process and 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
 

cmake-variants.yaml

@@ -21,3 +21,32 @@ linkage:
       short: Shared
       long: Create shared libraries/DLLs
       linkage: shared
+
+useLink:
+  default: withlink
+  choices:
+    withlink:
+      short: WithLink
+      long: Enable the Link feature
+      settings:
+        ENABLE_LINK: ON
+    nolink:
+      short: NoLink
+      long: Disable the Link feature
+      settings:
+        ENABLE_LINK: OFF
+
+useDebugger:
+  default: withdebugger
+  choices:
+    withdebugger:
+      short: WithDebugger
+      long: Enable the Debugger feature
+      settings:
+        ENABLE_DEBUGGER: ON
+    nodebugger:
+      short: NoDebugger
+      long: Disable the Debugger feature
+      settings:
+        ENABLE_DEBUGGER: OFF
+        ENABLE_SDL: OFF

cmake/Architecture.cmake

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

cmake/CMakeASM_NASMInformation.cmake

@@ -1,54 +0,0 @@
-
-#=============================================================================
-# Copyright 2010 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.)
-
-# support for the nasm assembler
-
-set(CMAKE_ASM_NASM_SOURCE_FILE_EXTENSIONS nasm asm)
-
-if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
-  if(WIN32)
-    if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
-      SET(CMAKE_ASM_NASM_OBJECT_FORMAT win64)
-    else()
-      SET(CMAKE_ASM_NASM_OBJECT_FORMAT win32)
-    endif()
-  elseif(APPLE)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_ASM_NASM_COMPILER} -v COMMAND awk "{print \$3}" OUTPUT_VARIABLE NASM_VERSION)
-    IF(NASM_VERSION VERSION_LESS 2.0)
-        IF(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
-            MESSAGE(FATAL_ERROR "Your nasm is too old to support AMD64, please install nasm from Homebrew or MacPorts.")
-        ENDIF()
-        SET(CMAKE_ASM_NAMS_OBJECT_FORMAT macho)
-    ELSE()
-        if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
-          SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho64)
-        else()
-          SET(CMAKE_ASM_NASM_OBJECT_FORMAT macho32)
-        endif()
-    ENDIF()
-  else()
-    if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
-      SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf64)
-    else()
-      SET(CMAKE_ASM_NASM_OBJECT_FORMAT elf32)
-    endif()
-  endif()
-endif()
-
-set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <DEFINES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
-
-# Load the generic ASMInformation file:
-set(ASM_DIALECT "_NASM")
-include(CMakeASMInformation)
-set(ASM_DIALECT)

cmake/CMakeDetermineASM_NASMCompiler.cmake

@@ -1,27 +0,0 @@
-
-#=============================================================================
-# Copyright 2010 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.)
-
-# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible
-
-SET(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm)
-
-IF(NOT CMAKE_ASM_NASM_COMPILER)
-  FIND_PROGRAM(CMAKE_ASM_NASM_COMPILER nasm
-    "$ENV{ProgramFiles}/NASM")
-ENDIF(NOT CMAKE_ASM_NASM_COMPILER)
-
-# Load the generic DetermineASM compiler file with the DIALECT set properly:
-SET(ASM_DIALECT "_NASM")
-INCLUDE(CMakeDetermineASMCompiler)
-SET(ASM_DIALECT)

cmake/CMakeDetermineMetalCompiler.cmake

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

cmake/CMakeMetalCompiler.cmake.in

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

cmake/CMakeMetalInformation.cmake

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

cmake/CMakeTestASM_NASMCompiler.cmake

@@ -1,23 +0,0 @@
-
-#=============================================================================
-# Copyright 2010 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 file is used by EnableLanguage in cmGlobalGenerator to
-# determine that the selected ASM_NASM "compiler" works.
-# For assembler this can only check whether the compiler has been found,
-# because otherwise there would have to be a separate assembler source file
-# for each assembler on every architecture.
-
-SET(ASM_DIALECT "_NASM")
-INCLUDE(CMakeTestASMCompiler)
-SET(ASM_DIALECT)

cmake/CMakeTestMetalCompiler.cmake

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

cmake/CheckLanguage.cmake

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

cmake/Dependencies.cmake

@@ -0,0 +1,146 @@
+if(TRANSLATIONS_ONLY)
+    return()
+endif()
+
+# Look for some dependencies using CMake scripts
+find_package(ZLIB REQUIRED)
+
+set(OpenGL_GL_PREFERENCE GLVND)
+
+if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
+    set(OpenGL_GL_PREFERENCE LEGACY)
+endif()
+
+if(NOT DISABLE_OPENGL)
+    find_package(OpenGL)
+
+    if(NOT OpenGL_FOUND)
+        set(CMAKE_C_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_C_FLAGS}")
+        set(CMAKE_CXX_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_CXX_FLAGS}")
+    endif()
+endif()
+
+# Add libsamplerate to SDL2 with vcpkg
+unset(SDL_LIBRARY_TEMP)
+if((NOT ENABLE_SDL3) AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+    if(WIN32)
+        unset(arch_suffix)
+        unset(path_prefix)
+        if(VCPKG_TARGET_TRIPLET MATCHES -static)
+            set(arch_suffix  -static)
+        endif()
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            set(path_prefix debug)
+        endif()
+
+        set(samplerate_lib_name samplerate)
+        set(installed_prefix    ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
+
+        if(MINGW)
+            set(installed_prefix    ${_VCPKG_INSTALLED_DIR}/${WINARCH}-mingw${arch_suffix}/${path_prefix})
+            set(samplerate_lib_name lib${samplerate_lib_name})
+        endif()
+
+        SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "${installed_prefix}/lib/${samplerate_lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    else()
+        SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} -lsamplerate)
+    endif()
+endif()
+
+if(ENABLE_SDL3)
+    if(UNIX AND NOT APPLE)
+        set(VBAM_SDL_LIBS "${SDL3_LIBRARIES}")
+    else()
+        if(VBAM_STATIC)
+            set(VBAM_SDL_LIBS SDL3::SDL3-static ${SDL_LIBRARY_TEMP})
+        else()
+            set(VBAM_SDL_LIBS SDL3::SDL3        ${SDL_LIBRARY_TEMP})
+        endif()
+    endif()
+else()
+    if(VBAM_STATIC)
+        set(VBAM_SDL_LIBS SDL2::SDL2-static ${SDL_LIBRARY_TEMP})
+    else()
+        set(VBAM_SDL_LIBS SDL2::SDL2        ${SDL_LIBRARY_TEMP})
+    endif()
+endif()
+
+if(ENABLE_FFMPEG)
+    if(NOT FFMPEG_LIBRARIES)
+        message(FATAL_ERROR "ENABLE_FFMPEG was specified, but required versions of ffmpeg libraries cannot be found!")
+    endif()
+
+    if(APPLE)
+        list(APPEND FFMPEG_LDFLAGS "SHELL:-framework CoreText" "SHELL:-framework ApplicationServices")
+
+        if(UPSTREAM_RELEASE)
+            list(APPEND FFMPEG_LDFLAGS -lbz2 -ltiff "SHELL:-framework DiskArbitration" -lfreetype -lfontconfig -llzma -lxml2 -lharfbuzz -lcrypto -lssl)
+        endif()
+    elseif(WIN32)
+        set(WIN32_MEDIA_FOUNDATION_LIBS dxva2 evr mf mfplat mfplay mfreadwrite mfuuid amstrmid)
+        list(APPEND FFMPEG_LIBRARIES secur32 bcrypt ${WIN32_MEDIA_FOUNDATION_LIBS})
+
+        if(MSYS AND VBAM_STATIC)
+            foreach(lib tiff jbig lzma)
+                cygpath(lib "$ENV{MSYSTEM_PREFIX}/lib/lib${lib}.a")
+
+                list(APPEND FFMPEG_LIBRARIES "${lib}")
+            endforeach()
+        endif()
+    endif()
+else()
+    add_compile_definitions(NO_FFMPEG)
+endif()
+
+if(ENABLE_LINK)
+    # IPC linking code needs sem_timedwait which can be either in librt or pthreads
+    if(NOT WIN32)
+        find_library(RT_LIB rt)
+        if(RT_LIB)
+           set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIB})
+           set(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${RT_LIB})
+        endif()
+    endif()
+
+    include(CheckFunctionExists)
+    check_function_exists(sem_timedwait SEM_TIMEDWAIT)
+    if(SEM_TIMEDWAIT)
+        add_compile_definitions(HAVE_SEM_TIMEDWAIT)
+    endif()
+else()
+    add_compile_definitions(NO_LINK)
+endif()
+
+# for now, only GBALink.cpp uses gettext() directly
+if(APPLE)
+    # use Homebrew gettext if available
+    if(EXISTS "/usr/local/opt/gettext")
+        set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};/usr/local/opt/gettext/include")
+        set(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/local/opt/gettext/lib")
+        set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};/usr/local/opt/gettext/bin")
+    endif()
+endif()
+
+if(ENABLE_LINK OR ENABLE_WX)
+    find_path(LIBINTL_INC libintl.h)
+    find_library(LIBINTL_LIB    NAMES libintl    intl)
+    find_library(LIBICONV_LIB   NAMES libiconv   iconv)
+    find_library(LIBCHARSET_LIB NAMES libcharset charset)
+    if(LIBINTL_LIB)
+        list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBINTL_LIB})
+        list(APPEND NLS_LIBS                 ${LIBINTL_LIB})
+    endif()
+    if(LIBICONV_LIB)
+        list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBICONV_LIB})
+        list(APPEND NLS_LIBS                 ${LIBICONV_LIB})
+    endif()
+    if(LIBCHARSET_LIB)
+        list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBCHARSET_LIB})
+        list(APPEND NLS_LIBS                 ${LIBCHARSET_LIB})
+    endif()
+    include(CheckFunctionExists)
+    check_function_exists(gettext GETTEXT_FN)
+    if(NOT (LIBINTL_INC OR GETTEXT_FN))
+        message(FATAL_ERROR "NLS requires libintl/gettext")
+    endif()
+endif()

cmake/FindFFmpeg.cmake

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

cmake/FindGettext.cmake

@@ -1,231 +1,232 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-#.rst:
-# FindGettext
-# -----------
-#
-# Find GNU gettext tools
-#
-# This module looks for the GNU gettext tools.  This module defines the
-# following values:
-#
-# ::
-#
-#   GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
-#   GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
-#   GETTEXT_FOUND: True if gettext has been found.
-#   GETTEXT_VERSION_STRING: the version of gettext found (since CMake 2.8.8)
-#
-#
-#
-# Additionally it provides the following macros:
-#
-# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ...  fileN )
-#
-# ::
-#
-#     This will create a target "translations" which will convert the
-#     given input po files into the binary output mo file. If the
-#     ALL option is used, the translations will also be created when
-#     building the default target.
-#
-# GETTEXT_PROCESS_POT_FILE( <potfile> [ALL] [INSTALL_DESTINATION <destdir>]
-# LANGUAGES <lang1> <lang2> ...  )
-#
-# ::
-#
-#      Process the given pot file to mo files.
-#      If INSTALL_DESTINATION is given then automatically install rules will
-#      be created, the language subdirectory will be taken into account
-#      (by default use share/locale/).
-#      If ALL is specified, the pot file is processed when building the all traget.
-#      It creates a custom target "potfile".
-#
-# GETTEXT_PROCESS_PO_FILES( <lang> [ALL] [INSTALL_DESTINATION <dir>]
-# PO_FILES <po1> <po2> ...  )
-#
-# ::
-#
-#      Process the given po files to mo files for the given language.
-#      If INSTALL_DESTINATION is given then automatically install rules will
-#      be created, the language subdirectory will be taken into account
-#      (by default use share/locale/).
-#      If ALL is specified, the po files are processed when building the all traget.
-#      It creates a custom target "pofiles".
-#
-# .. note::
-#   If you wish to use the Gettext library (libintl), use :module:`FindIntl`.
+#[=======================================================================[.rst:
+FindGettext
+-----------
+
+Find GNU gettext tools
+
+This module looks for the GNU gettext tools.  This module defines the
+following values:
+
+::
+
+  GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
+  GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
+  GETTEXT_FOUND: True if gettext has been found.
+  GETTEXT_VERSION_STRING: the version of gettext found (since CMake 2.8.8)
+
+
+
+Additionally it provides the following macros:
+
+GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ...  fileN )
+
+::
+
+    This will create a target "translations" which will convert the
+    given input po files into the binary output mo file. If the
+    ALL option is used, the translations will also be created when
+    building the default target.
+
+GETTEXT_PROCESS_POT_FILE( <potfile> [ALL] [INSTALL_DESTINATION <destdir>]
+LANGUAGES <lang1> <lang2> ...  )
+
+::
+
+     Process the given pot file to mo files.
+     If INSTALL_DESTINATION is given then automatically install rules will
+     be created, the language subdirectory will be taken into account
+     (by default use share/locale/).
+     If ALL is specified, the pot file is processed when building the all target.
+     It creates a custom target "potfile".
+
+GETTEXT_PROCESS_PO_FILES( <lang> [ALL] [INSTALL_DESTINATION <dir>]
+PO_FILES <po1> <po2> ...  )
+
+::
+
+     Process the given po files to mo files for the given language.
+     If INSTALL_DESTINATION is given then automatically install rules will
+     be created, the language subdirectory will be taken into account
+     (by default use share/locale/).
+     If ALL is specified, the po files are processed when building the all target.
+     It creates a custom target "pofiles".
+
+.. versionadded:: 3.2
+  If you wish to use the Gettext library (libintl), use :module:`FindIntl`.
+#]=======================================================================]
 
 find_program(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
 
 find_program(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
 
 if(GETTEXT_MSGMERGE_EXECUTABLE)
-   execute_process(COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --version
+  execute_process(COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --version
                   OUTPUT_VARIABLE gettext_version
                   ERROR_QUIET
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
-   get_filename_component(msgmerge_name ${GETTEXT_MSGMERGE_EXECUTABLE} NAME)
-   get_filename_component(msgmerge_namewe ${GETTEXT_MSGMERGE_EXECUTABLE} NAME_WE)
-   if (gettext_version MATCHES "^(${msgmerge_name}|${msgmerge_namewe}) \\([^\\)]*\\) ([0-9\\.]+[^ \n]*)")
-      set(GETTEXT_VERSION_STRING "${CMAKE_MATCH_2}")
-   endif()
-   unset(gettext_version)
-   unset(msgmerge_name)
-   unset(msgmerge_namewe)
+  get_filename_component(msgmerge_name ${GETTEXT_MSGMERGE_EXECUTABLE} NAME)
+  get_filename_component(msgmerge_namewe ${GETTEXT_MSGMERGE_EXECUTABLE} NAME_WE)
+  if (gettext_version MATCHES "^(${msgmerge_name}|${msgmerge_namewe}) \\([^\\)]*\\) ([0-9\\.]+[^ \n]*)")
+    set(GETTEXT_VERSION_STRING "${CMAKE_MATCH_2}")
+  endif()
+  unset(gettext_version)
+  unset(msgmerge_name)
+  unset(msgmerge_namewe)
 endif()
 
 include(FindPackageHandleStandardArgs)
-
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
                                   REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
                                   VERSION_VAR GETTEXT_VERSION_STRING)
 
 function(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
-   set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
-   get_property(currentCounter GLOBAL PROPERTY "${propertyName}")
-   if(NOT currentCounter)
-      set(currentCounter 1)
-   endif()
-   set(${_unique_name} "${_name}_${currentCounter}" PARENT_SCOPE)
-   math(EXPR currentCounter "${currentCounter} + 1")
-   set_property(GLOBAL PROPERTY ${propertyName} ${currentCounter} )
+  set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
+  get_property(currentCounter GLOBAL PROPERTY "${propertyName}")
+  if(NOT currentCounter)
+    set(currentCounter 1)
+  endif()
+  set(${_unique_name} "${_name}_${currentCounter}" PARENT_SCOPE)
+  math(EXPR currentCounter "${currentCounter} + 1")
+  set_property(GLOBAL PROPERTY ${propertyName} ${currentCounter} )
 endfunction()
 
 macro(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
-   # make it a real variable, so we can modify it here
-   set(_firstPoFile "${_firstPoFileArg}")
+  # make it a real variable, so we can modify it here
+  set(_firstPoFile "${_firstPoFileArg}")
 
-   set(_gmoFiles)
-   get_filename_component(_potName ${_potFile} NAME)
-   string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
-   get_filename_component(_absPotFile ${_potFile} ABSOLUTE)
+  set(_gmoFiles)
+  get_filename_component(_potName ${_potFile} NAME)
+  string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
+  get_filename_component(_absPotFile ${_potFile} ABSOLUTE)
 
-   set(_addToAll)
-   if(${_firstPoFile} STREQUAL "ALL")
-      set(_addToAll "ALL")
-      set(_firstPoFile)
-   endif()
+  set(_addToAll)
+  if(${_firstPoFile} STREQUAL "ALL")
+    set(_addToAll "ALL")
+    set(_firstPoFile)
+  endif()
 
-   foreach (_currentPoFile ${_firstPoFile} ${ARGN})
-      get_filename_component(_absFile ${_currentPoFile} ABSOLUTE)
-      get_filename_component(_abs_PATH ${_absFile} PATH)
-      string(REGEX REPLACE "^.*/([^/]+)(\\.[^.]+)$" "\\1" _lang ${_absFile})
-      set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+  foreach (_currentPoFile ${_firstPoFile} ${ARGN})
+    get_filename_component(_absFile ${_currentPoFile} ABSOLUTE)
+    get_filename_component(_abs_PATH ${_absFile} PATH)
+    get_filename_component(_lang ${_absFile} NAME_WE)
+    set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
 
-      add_custom_command(
-         OUTPUT ${_gmoFile}
-         #COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
-         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
-         DEPENDS ${_absPotFile} ${_absFile}
-      )
+    add_custom_command(
+      OUTPUT ${_gmoFile}
+#      COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+      DEPENDS ${_absPotFile} ${_absFile}
+    )
 
-      install(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
-      set(_gmoFiles ${_gmoFiles} ${_gmoFile})
+    install(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
+    set(_gmoFiles ${_gmoFiles} ${_gmoFile})
 
-   endforeach ()
+  endforeach ()
 
-   if(NOT TARGET translations)
-      add_custom_target(translations)
-   endif()
+  if(NOT TARGET translations)
+    add_custom_target(translations)
+  endif()
 
   _GETTEXT_GET_UNIQUE_TARGET_NAME(translations uniqueTargetName)
 
-   add_custom_target(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles})
+  add_custom_target(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles})
+
+  add_dependencies(translations ${uniqueTargetName})
 
-   add_dependencies(translations ${uniqueTargetName})
 endmacro()
 
 
 function(GETTEXT_PROCESS_POT_FILE _potFile)
-   set(_gmoFiles)
-   set(_options ALL)
-   set(_oneValueArgs INSTALL_DESTINATION)
-   set(_multiValueArgs LANGUAGES)
+  set(_gmoFiles)
+  set(_options ALL)
+  set(_oneValueArgs INSTALL_DESTINATION)
+  set(_multiValueArgs LANGUAGES)
 
-   CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+  CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
 
-   get_filename_component(_potName ${_potFile} NAME)
-   string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
-   get_filename_component(_absPotFile ${_potFile} ABSOLUTE)
+  get_filename_component(_potName ${_potFile} NAME)
+  string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _potBasename ${_potName})
+  get_filename_component(_absPotFile ${_potFile} ABSOLUTE)
 
-   foreach (_lang ${_parsedArguments_LANGUAGES})
-      set(_poFile  "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.po")
-      set(_gmoFile "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo")
+  foreach (_lang ${_parsedArguments_LANGUAGES})
+    set(_poFile  "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.po")
+    set(_gmoFile "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo")
 
-      add_custom_command(
-         OUTPUT "${_poFile}"
-         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_poFile} ${_absPotFile}
-         DEPENDS ${_absPotFile}
-      )
+    add_custom_command(
+      OUTPUT "${_poFile}"
+      COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_poFile} ${_absPotFile}
+      DEPENDS ${_absPotFile}
+    )
 
-      add_custom_command(
-         OUTPUT "${_gmoFile}"
-         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
-         DEPENDS ${_absPotFile} ${_poFile}
-      )
+    add_custom_command(
+      OUTPUT "${_gmoFile}"
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
+      DEPENDS ${_absPotFile} ${_poFile}
+    )
 
-      if(_parsedArguments_INSTALL_DESTINATION)
-         install(FILES ${_gmoFile} DESTINATION ${_parsedArguments_INSTALL_DESTINATION}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
-      endif()
-      list(APPEND _gmoFiles ${_gmoFile})
-   endforeach ()
+    if(_parsedArguments_INSTALL_DESTINATION)
+      install(FILES ${_gmoFile} DESTINATION ${_parsedArguments_INSTALL_DESTINATION}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
+    endif()
+    list(APPEND _gmoFiles ${_gmoFile})
+  endforeach ()
 
   if(NOT TARGET potfiles)
-     add_custom_target(potfiles)
+    add_custom_target(potfiles)
   endif()
 
   _GETTEXT_GET_UNIQUE_TARGET_NAME( potfiles uniqueTargetName)
 
-   if(_parsedArguments_ALL)
-      add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
-   else()
-      add_custom_target(${uniqueTargetName} DEPENDS ${_gmoFiles})
-   endif()
+  if(_parsedArguments_ALL)
+    add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
+  else()
+    add_custom_target(${uniqueTargetName} DEPENDS ${_gmoFiles})
+  endif()
 
-   add_dependencies(potfiles ${uniqueTargetName})
+  add_dependencies(potfiles ${uniqueTargetName})
 
 endfunction()
 
 
 function(GETTEXT_PROCESS_PO_FILES _lang)
-   set(_options ALL)
-   set(_oneValueArgs INSTALL_DESTINATION)
-   set(_multiValueArgs PO_FILES)
-   set(_gmoFiles)
+  set(_options ALL)
+  set(_oneValueArgs INSTALL_DESTINATION)
+  set(_multiValueArgs PO_FILES)
+  set(_gmoFiles)
 
-   CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+  CMAKE_PARSE_ARGUMENTS(_parsedArguments "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
 
-   foreach(_current_PO_FILE ${_parsedArguments_PO_FILES})
-      get_filename_component(_name ${_current_PO_FILE} NAME)
-      string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _basename ${_name})
-      set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
-      add_custom_command(OUTPUT ${_gmoFile}
-            COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
-            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-            DEPENDS ${_current_PO_FILE}
-         )
+  foreach(_current_PO_FILE ${_parsedArguments_PO_FILES})
+    get_filename_component(_name ${_current_PO_FILE} NAME)
+    string(REGEX REPLACE "^(.+)(\\.[^.]+)$" "\\1" _basename ${_name})
+    set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
+    add_custom_command(OUTPUT ${_gmoFile}
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      DEPENDS ${_current_PO_FILE}
+    )
 
-      if(_parsedArguments_INSTALL_DESTINATION)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo DESTINATION ${_parsedArguments_INSTALL_DESTINATION}/${_lang}/LC_MESSAGES/ RENAME ${_basename}.mo)
-      endif()
-      list(APPEND _gmoFiles ${_gmoFile})
-   endforeach()
+    if(_parsedArguments_INSTALL_DESTINATION)
+      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo DESTINATION ${_parsedArguments_INSTALL_DESTINATION}/${_lang}/LC_MESSAGES/ RENAME ${_basename}.mo)
+    endif()
+    list(APPEND _gmoFiles ${_gmoFile})
+  endforeach()
 
 
   if(NOT TARGET pofiles)
-     add_custom_target(pofiles)
+    add_custom_target(pofiles)
   endif()
 
   _GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName)
 
-   if(_parsedArguments_ALL)
-      add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
-   else()
-      add_custom_target(${uniqueTargetName} DEPENDS ${_gmoFiles})
-   endif()
+  if(_parsedArguments_ALL)
+    add_custom_target(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
+  else()
+    add_custom_target(${uniqueTargetName} DEPENDS ${_gmoFiles})
+  endif()
 
-   add_dependencies(pofiles ${uniqueTargetName})
+  add_dependencies(pofiles ${uniqueTargetName})
 
 endfunction()

cmake/FindOpenAL.cmake

@@ -1,110 +0,0 @@
-#.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)

cmake/FindSDL2.cmake

@@ -1,263 +0,0 @@
-# This module defines
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# If you have pkg-config, these extra variables are also defined:
-# SDL2_DEFINITIONS, extra CFLAGS
-# SDL2_EXTRA_LIBS, extra link libs
-# SDL2_LINKER_FLAGS, extra link flags
-#
-# The latter two are automatically added to SDL2_LIBRARY
-#
-# To use them, add code such as:
-#
-# # SET(SDL2_STATIC ON) # if you want to link SDL2 statically
-# FIND_PACKAGE(SDL2 REQUIRED)
-# ADD_DEFINITIONS(${SDL2_DEFINITIONS})
-# TARGET_LINK_LIBRARIES(your-executable-target ${SDL2_LIBRARY} ...)
-#
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
-#
-# If you want to link SDL2 statically, set SDL2_STATIC to ON.
-#
-# Don't forget to include SDLmain.h and SDLmain.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-# l.e.galup  9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL3/SDL.h to just SDL.h
-# This needed to change because "proper" SDL convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-
-#=============================================================================
-# Copyright 2003-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.)
-
-SET(SDL2_SEARCH_PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local # Mac Homebrew and local installs
-	/usr
-	/sw # Fink
-	/opt/local # MacPorts
-	/opt/csw # OpenCSW (Solaris)
-	/opt
-	${SDL2_PATH}/include
-	${SDL2_PATH}/lib
-)
-
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-	HINTS $ENV{SDL2DIR}
-	PATH_SUFFIXES SDL2
-	PATHS ${SDL2_SEARCH_PATHS}
-)
-
-SET(CURRENT_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
-if(SDL2_STATIC)
-    if(MSVC)
-	set(CMAKE_FIND_LIBRARY_SUFFIXES .lib)
-    else()
-	set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-    endif()
-endif()
-
-unset(lib_suffixes)
-if(MSVC)
-    if(VCPKG_TARGET_TRIPLET MATCHES "-static$")
-	list(APPEND lib_suffixes -static)
-    endif()
-
-    if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
-	list(APPEND lib_suffixes d)
-    endif()
-endif()
-
-# Calculate combination of possible name+suffixes.
-unset(names)
-set(lib_name SDL2)
-set(current ${lib_name})
-foreach(suffix ${lib_suffixes})
-    list(APPEND names "${current}${suffix}" "${lib_name}${suffix}")
-    set(current "${current}${suffix}")
-endforeach()
-
-# Fallback to name by itself.
-list(APPEND names ${lib_name})
-
-FIND_LIBRARY(SDL2_LIBRARY_TEMP
-    NAMES ${names}
-    HINTS $ENV{SDL2DIR}
-    PATH_SUFFIXES lib64 lib lib/x64 lib/x86
-    PATHS ${SDL2_SEARCH_PATHS}
-)
-
-if(NOT (SDL2_BUILDING_LIBRARY OR ${SDL2_INCLUDE_DIR} MATCHES ".framework"))
-    # Non-OS X framework versions expect you to also dynamically link to
-    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-    # seem to provide SDL2main for compatibility even though they don't
-    # necessarily need it.
-    find_library(SDL2MAIN_LIBRARY
-	NAMES SDL2main${lib_suffix}
-	HINTS $ENV{SDL2DIR}
-	PATH_SUFFIXES lib64 lib lib/x64 lib/x86
-	PATHS ${SDL2_SEARCH_PATHS}
-    )
-endif()
-
-SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CURRENT_FIND_LIBRARY_SUFFIXES})
-UNSET(CURRENT_FIND_LIBRARY_SUFFIXES)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-	FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional link flag, -mwindows (to make a GUI app)
-# but we only add it when not making a Debug build.
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows
-IF(MINGW)
-	SET(MINGW32_LIBRARY -lmingw32 CACHE STRING "MinGW library")
-
-	if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
-            SET(MINGW32_LIBRARY ${MINGW32_LIBRARY} -mwindows)
-        ENDIF()
-ENDIF(MINGW)
-
-IF(SDL2_LIBRARY_TEMP)
-	# For SDL2main
-	if(SDL2MAIN_LIBRARY AND NOT WIN32)
-	    SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-	endif()
-
-	# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-	# CMake doesn't display the -framework Cocoa string in the UI even
-	# though it actually is there if I modify a pre-used variable.
-	# I think it has something to do with the CACHE STRING.
-	# So I use a temporary variable until the end so I can set the
-	# "real" variable in one-shot.
-	IF(APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-	ENDIF(APPLE)
-
-	# For threads, as mentioned Apple doesn't need this.
-	# In fact, there seems to be a problem if I used the Threads package
-	# and try using this line, so I'm just skipping it entirely for OS X.
-	IF(NOT APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-	ENDIF(NOT APPLE)
-
-	# For MinGW library
-	IF(MINGW)
-		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP} -lversion -limm32)
-	ENDIF(MINGW)
-
-	# Add libsamplerate with vcpkg
-	if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
-	    if(WIN32)
-		unset(arch_suffix)
-		unset(path_prefix)
-		if(VCPKG_TARGET_TRIPLET MATCHES -static)
-		    set(arch_suffix  -static)
-		endif()
-		if(CMAKE_BUILD_TYPE MATCHES "^(Debug|RelWithDebInfo)$")
-		    set(path_prefix debug)
-		endif()
-		set(installed_prefix ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows${arch_suffix}/${path_prefix})
-
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${installed_prefix}/lib/samplerate.lib)
-	    else()
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} -lsamplerate)
-	    endif()
-	endif()
-
-        # Add some stuff from pkg-config, if available
-        IF(NOT PKG_CONFIG_EXECUTABLE)
-            FIND_PACKAGE(PkgConfig QUIET)
-        ENDIF(NOT PKG_CONFIG_EXECUTABLE)
-
-        IF(PKG_CONFIG_EXECUTABLE)
-            # get any definitions
-            EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags-only-other sdl2 OUTPUT_VARIABLE SDL2_DEFINITIONS ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-            SET(SDL2_DEFINITIONS ${SDL2_DEFINITIONS} CACHE STRING "Extra CFLAGS for SDL2 from pkg-config")
-
-            # get any extra stuff needed for linking
-            IF(NOT SDL2_STATIC)
-                EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE}          --libs-only-other sdl2 OUTPUT_VARIABLE SDL2_LINKER_FLAGS_RAW    ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-                EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE}          --libs-only-l     sdl2 OUTPUT_VARIABLE SDL2_EXTRA_LIBS_RAW      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-            ELSE(NOT SDL2_STATIC)
-                EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --static --libs-only-other sdl2 OUTPUT_VARIABLE SDL2_LINKER_FLAGS_RAW    ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-                EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --static --libs-only-l     sdl2 OUTPUT_VARIABLE SDL2_EXTRA_LIBS_RAW      ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-            ENDIF(NOT SDL2_STATIC)
-
-            STRING(REGEX REPLACE "[^ ]+SDL2[^ ]*" ""  SDL2_EXTRA_LIBS_RAW2 "${SDL2_EXTRA_LIBS_RAW}")
-            STRING(REGEX REPLACE " +"             ";" SDL2_EXTRA_LIBS      "${SDL2_EXTRA_LIBS_RAW2}")
-            STRING(REGEX REPLACE " +"             ";" SDL2_LINKER_FLAGS    "${SDL2_LINKER_FLAGS_RAW}")
-
-            SET(SDL2_LINKER_FLAGS ${SDL2_LINKER_FLAGS} CACHE STRING "Linker flags for linking SDL2")
-            SET(SDL2_EXTRA_LIBS   ${SDL2_EXTRA_LIBS}   CACHE STRING "Extra libraries for linking SDL2")
-
-            SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${SDL2_EXTRA_LIBS} ${SDL2_LINKER_FLAGS})
-        ENDIF(PKG_CONFIG_EXECUTABLE)
-
-	# Set the final string here so the GUI reflects the final state.
-	SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-	SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
-ENDIF(SDL2_LIBRARY_TEMP)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

cmake/FindSFML.cmake

@@ -1,365 +0,0 @@
-# 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_definitions(-DSFML_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()

cmake/FindSSP.cmake

@@ -1,76 +0,0 @@
-# FindSSP.cmake
-#
-# Find libssp necessary when using gcc with e.g. -fstack-protector=strong
-#
-# See: http://wiki.osdev.org/Stack_Smashing_Protector
-#
-# To use:
-#
-# put a copy into your <project_root>/cmake/
-#
-# In your main CMakeLists.txt do something like this:
-#
-# if(WIN32)
-#     set(SSP_STATIC ON)
-# endif()
-#
-# find_package(SSP)
-#
-# if(SSP_LIBRARY)
-#     set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${SSP_LIBRARY}")
-#     set(CMAKE_C_LINK_EXECUTABLE   "${CMAKE_C_LINK_EXECUTABLE}   ${SSP_LIBRARY}")
-# endif()
-
-# only do this when compiling with gcc/g++
-if(NOT CMAKE_COMPILER_IS_GNUCXX)
-    return()
-endif()
-
-function(FindSSP)
-    if(NOT CMAKE_CXX_COMPILER AND CMAKE_C_COMPILER)
-        set(CMAKE_CXX_COMPILER ${CMAKE_C_COMPILER})
-    endif()
-
-    foreach(arg ${CMAKE_CXX_COMPILER_ARG1} ${CMAKE_CXX_COMPILER_ARG2} ${CMAKE_CXX_COMPILER_ARG3} ${CMAKE_CXX_COMPILER_ARG4} ${CMAKE_CXX_COMPILER_ARG5} ${CMAKE_CXX_COMPILER_ARG6} ${CMAKE_CXX_COMPILER_ARG7} ${CMAKE_CXX_COMPILER_ARG8} ${CMAKE_CXX_COMPILER_ARG9})
-        string(STRIP ${arg} arg)
-        set(gcc_args "${gcc_args};${arg}")
-    endforeach()
-
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${gcc_args} --print-prog-name=gcc OUTPUT_VARIABLE GCC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if(WIN32 AND NOT MSYS)
-        execute_process(COMMAND where.exe         ${GCC_EXECUTABLE}  OUTPUT_VARIABLE GCC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    else()
-        execute_process(COMMAND sh -c "command -v ${GCC_EXECUTABLE}" OUTPUT_VARIABLE GCC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    endif()
-
-    get_filename_component(GCC_DIRNAME "${GCC_EXECUTABLE}" DIRECTORY)
-
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${gcc_args} --print-libgcc-file-name OUTPUT_VARIABLE LIBGCC_FILE OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    get_filename_component(LIBGCC_DIRNAME "${LIBGCC_FILE}" DIRECTORY)
-
-    set(SSP_SEARCH_PATHS ${GCC_DIRNAME} ${LIBGCC_DIRNAME})
-
-    if(SSP_STATIC)
-        if(WIN32)
-            set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-        else()
-            set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-        endif()
-    endif()
-
-    find_library(SSP_LIBRARY
-        NAMES ssp libssp
-        HINTS ${SSP_SEARCH_PATHS}
-        PATH_SUFFIXES lib64 lib lib/x64 lib/x86
-    )
-
-    set(SSP_LIBRARY PARENT_SCOPE)
-endfunction()
-
-FindSSP()
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(SSP REQUIRED_VARS SSP_LIBRARY)

cmake/GetGitRevisionDescription.cmake

@@ -7,23 +7,6 @@
 #
 # Returns the refspec and sha hash of the current head revision
 #
-#  git_describe(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe on the source tree, and adjusting
-# the output so that it tests false if an error occurs.
-#
-#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
-#
-# Returns the results of git describe --exact-match on the source tree,
-# and adjusting the output so that it tests false if there was no exact
-# matching tag.
-#
-#  git_local_changes(<var>)
-#
-# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
-# Uses the return code of "git diff-index --quiet HEAD --".
-# Does not regard untracked files.
-#
 # Requires CMake 2.6 or newer (uses the 'function' command)
 #
 # Original Author:
@@ -85,84 +68,3 @@ function(get_git_head_revision _refspecvar _hashvar)
 	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
 	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
 endfunction()
-
-function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
-
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_CURRENT_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
-
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_get_exact_tag _var)
-	git_describe(out --exact-match ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
-endfunction()
-
-function(git_local_changes _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		diff-index --quiet HEAD --
-		WORKING_DIRECTORY
-		"${CMAKE_CURRENT_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(res EQUAL 0)
-		set(${_var} "CLEAN" PARENT_SCOPE)
-	else()
-		set(${_var} "DIRTY" PARENT_SCOPE)
-	endif()
-endfunction()

cmake/GitTagVersion.cmake

@@ -3,7 +3,6 @@ function(git_version version revision version_release)
     set(${revision}        "" CACHE STRING "Latest Git Tag Revision" FORCE)
     set(${version_release} 0  CACHE STRING "Is this a versioned release without revision" FORCE)
 
-    find_package(Git)
     if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
         # get latest version from tag history
         execute_process(COMMAND "${GIT_EXECUTABLE}" tag "--format=%(align:width=20)%(refname:short)%(end)%(if)%(*objectname)%(then)%(*objectname)%(else)%(objectname)%(end)" --sort=-v:refname OUTPUT_VARIABLE tags OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")

cmake/LLVMToolchain.cmake

@@ -1,44 +0,0 @@
-function(use_llvm_toolchain)
-    if(CMAKE_C_COMPILER_ID STREQUAL Clang)
-        set(compiler "${CMAKE_C_COMPILER}")
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-        set(compiler "${CMAKE_CXX_COMPILER}")
-    else()
-        return()
-    endif()
-
-    foreach(tool ar ranlib ld nm objdump as)
-        execute_process(
-            COMMAND "${compiler}" -print-prog-name=llvm-${tool}
-            OUTPUT_VARIABLE prog_path
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-
-        # for FreeBSD
-        if(NOT prog_path MATCHES "^/")
-            get_filename_component(
-                abs_path ${prog_path} ABSOLUTE
-                BASE_DIR /usr/local/llvm-devel/bin
-            )
-
-            if(EXISTS ${abs_path})
-                set(prog_path ${abs_path})
-            endif()
-        endif()
-
-        if(prog_path MATCHES "^/")
-            if(tool STREQUAL ld)
-                set(tool linker)
-            elseif(tool STREQUAL as)
-                set(tool asm_compiler)
-            endif()
-
-            string(TOUPPER ${tool} utool)
-
-            set(CMAKE_${utool} "${prog_path}" PARENT_SCOPE)
-            set(CMAKE_${utool} "${prog_path}" CACHE FILEPATH "${tool}" FORCE)
-        endif()
-    endforeach()
-endfunction()
-
-use_llvm_toolchain()

cmake/MacPackageManagers.cmake

@@ -11,8 +11,8 @@
 # In addition, the following commands are called with the package manager's
 # paths:
 #
-# INCLUDE_DIRECTORIES()
-# LINK_DIRECTORIES()
+# include_directories()
+# link_directories()
 #
 # The paths of package managers not currently in $ENV{PATH} are added to
 # CMAKE_IGNORE_PATH .
@@ -41,68 +41,75 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IF(NOT APPLE)
-    RETURN()
-ENDIF()
+if(NOT APPLE)
+    return()
+endif()
 
-IF(EXISTS /usr/local/bin/brew AND $ENV{PATH} MATCHES "(^|:)/usr/local/bin/?(:|$)")
-    MESSAGE("-- Configuring for Mac Homebrew")
+if(NOT "$ENV{IN_NIX_SHELL}" STREQUAL "")
+    message(STATUS "Configuring for Nix")
 
-    SET(MAC_HOMEBREW ON)
+    set(NIX ON)
 
-    SET(CMAKE_IGNORE_PATH /opt/local /opt/local/bin /opt/local/include /opt/local/Library/Frameworks /opt/local/lib ${CMAKE_IGNORE_PATH})
-    SET(CMAKE_IGNORE_PATH /sw /sw/bin /sw/include /sw/Library/Frameworks /sw/lib ${CMAKE_IGNORE_PATH})
+    set(CMAKE_IGNORE_PATH /opt/local /opt/local/bin /opt/local/include /opt/local/Library/Frameworks /opt/local/lib ${CMAKE_IGNORE_PATH})
+    set(CMAKE_IGNORE_PATH /sw /sw/bin /sw/include /sw/Library/Frameworks /sw/lib ${CMAKE_IGNORE_PATH})
+elseif(EXISTS /usr/local/bin/brew AND $ENV{PATH} MATCHES "(^|:)/usr/local/bin/?(:|$)")
+    message(STATUS "Configuring for Mac Homebrew")
 
-    SET(CMAKE_FRAMEWORK_PATH /usr/local/Frameworks ${CMAKE_FRAMEWORK_PATH})
+    set(MAC_HOMEBREW ON)
 
-    SET(CMAKE_INCLUDE_PATH /usr/local/include ${CMAKE_INCLUDE_PATH})
-    INCLUDE_DIRECTORIES("/usr/local/include")
+    set(CMAKE_IGNORE_PATH /opt/local /opt/local/bin /opt/local/include /opt/local/Library/Frameworks /opt/local/lib ${CMAKE_IGNORE_PATH})
+    set(CMAKE_IGNORE_PATH /sw /sw/bin /sw/include /sw/Library/Frameworks /sw/lib ${CMAKE_IGNORE_PATH})
 
-    SET(CMAKE_LIBRARY_PATH /usr/local/lib ${CMAKE_LIBRARY_PATH})
-    LINK_DIRECTORIES("/usr/local/lib")
+    set(CMAKE_FRAMEWORK_PATH /usr/local/Frameworks ${CMAKE_FRAMEWORK_PATH})
 
-    SET(CMAKE_PROGRAM_PATH /usr/local/bin ${CMAKE_PROGRAM_PATH})
+    set(CMAKE_INCLUDE_PATH /usr/local/include ${CMAKE_INCLUDE_PATH})
+    include_directories("/usr/local/include")
+
+    set(CMAKE_LIBRARY_PATH /usr/local/lib ${CMAKE_LIBRARY_PATH})
+    link_directories("/usr/local/lib")
+
+    set(CMAKE_PROGRAM_PATH /usr/local/bin ${CMAKE_PROGRAM_PATH})
 
     set(ZLIB_ROOT /usr/local/opt/zlib)
-ELSEIF(EXISTS /opt/local/bin/port AND $ENV{PATH} MATCHES "(^|:)/opt/local/bin/?(:|$)")
-    MESSAGE("-- Configuring for MacPorts")
+elseif(EXISTS /opt/local/bin/port AND $ENV{PATH} MATCHES "(^|:)/opt/local/bin/?(:|$)")
+    message(STATUS "Configuring for MacPorts")
 
-    SET(MACPORTS ON)
+    set(MACPORTS ON)
 
-    SET(CMAKE_IGNORE_PATH /sw /sw/bin /sw/include /sw/Library/Frameworks /sw/lib ${CMAKE_IGNORE_PATH})
+    set(CMAKE_IGNORE_PATH /sw /sw/bin /sw/include /sw/Library/Frameworks /sw/lib ${CMAKE_IGNORE_PATH})
 
-    SET(CMAKE_FRAMEWORK_PATH /opt/local/Library/Frameworks ${CMAKE_FRAMEWORK_PATH})
+    set(CMAKE_FRAMEWORK_PATH /opt/local/Library/Frameworks ${CMAKE_FRAMEWORK_PATH})
 
-    SET(CMAKE_INCLUDE_PATH /opt/local/include ${CMAKE_INCLUDE_PATH})
-    INCLUDE_DIRECTORIES("/opt/local/include")
+    set(CMAKE_INCLUDE_PATH /opt/local/include ${CMAKE_INCLUDE_PATH})
+    include_directories("/opt/local/include")
 
-    SET(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
-    LINK_DIRECTORIES("/opt/local/lib")
+    set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
+    link_directories("/opt/local/lib")
 
-    SET(CMAKE_PROGRAM_PATH /opt/local/bin ${CMAKE_PROGRAM_PATH})
-ELSEIF(EXISTS /sw/bin/fink AND $ENV{PATH} MATCHES "(^|:)/sw/bin/?(:|$)")
-    MESSAGE("-- Configuring for Fink")
+    set(CMAKE_PROGRAM_PATH /opt/local/bin ${CMAKE_PROGRAM_PATH})
+elseif(EXISTS /sw/bin/fink AND $ENV{PATH} MATCHES "(^|:)/sw/bin/?(:|$)")
+    message(STATUS "Configuring for Fink")
 
-    SET(FINK ON)
+    set(FINK ON)
 
-    SET(CMAKE_IGNORE_PATH /opt/local /opt/local/bin /opt/local/include /opt/local/Library/Frameworks /opt/local/lib ${CMAKE_IGNORE_PATH})
+    set(CMAKE_IGNORE_PATH /opt/local /opt/local/bin /opt/local/include /opt/local/Library/Frameworks /opt/local/lib ${CMAKE_IGNORE_PATH})
 
-    SET(CMAKE_FRAMEWORK_PATH /sw/Library/Frameworks ${CMAKE_FRAMEWORK_PATH})
+    set(CMAKE_FRAMEWORK_PATH /sw/Library/Frameworks ${CMAKE_FRAMEWORK_PATH})
 
-    SET(CMAKE_INCLUDE_PATH /sw/include ${CMAKE_INCLUDE_PATH})
-    INCLUDE_DIRECTORIES("/sw/include")
+    set(CMAKE_INCLUDE_PATH /sw/include ${CMAKE_INCLUDE_PATH})
+    include_directories("/sw/include")
 
-    SET(CMAKE_LIBRARY_PATH /sw/lib ${CMAKE_LIBRARY_PATH})
-    LINK_DIRECTORIES("/sw/lib")
+    set(CMAKE_LIBRARY_PATH /sw/lib ${CMAKE_LIBRARY_PATH})
+    link_directories("/sw/lib")
 
-    SET(CMAKE_PROGRAM_PATH /sw/bin ${CMAKE_PROGRAM_PATH})
-ELSE()
+    set(CMAKE_PROGRAM_PATH /sw/bin ${CMAKE_PROGRAM_PATH})
+else()
     # no package manager found or active, do nothing
-    RETURN()
-ENDIF()
+    return()
+endif()
 
 # only ignore /usr/local if brew is installed and not in the PATH
 # in other cases, it is the user's personal installations
-IF(NOT MAC_HOMEBREW AND EXISTS /usr/local/bin/brew)
-    SET(CMAKE_IGNORE_PATH /usr/local /usr/local/bin /usr/local/include /usr/local/Library/Frameworks /usr/local/lib ${CMAKE_IGNORE_PATH})
-ENDIF()
+if(NOT MAC_HOMEBREW AND EXISTS /usr/local/bin/brew)
+    set(CMAKE_IGNORE_PATH /usr/local /usr/local/bin /usr/local/include /usr/local/Library/Frameworks /usr/local/lib /usr/local/opt/gettext/bin /usr/local/opt/gettext/lib ${CMAKE_IGNORE_PATH})
+endif()

cmake/MakeReleaseCommitAndTag.cmake

@@ -10,12 +10,6 @@ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
     message(FATAL_ERROR "releases can only be done from a git clone")
 endif()
 
-find_package(Git)
-
-if(NOT GIT_FOUND)
-    message(FATAL_ERROR "git is required to make a release")
-endif()
-
 find_program(GPG_EXECUTABLE gpg)
 
 if(NOT GPG_EXECUTABLE)
@@ -37,7 +31,7 @@ function(make_release_commit_and_tag)
     # First make sure we are on master.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --short --abbrev-ref=strict HEAD
+        COMMAND git rev-parse --short --abbrev-ref=strict HEAD
         OUTPUT_VARIABLE git_branch
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -48,7 +42,7 @@ function(make_release_commit_and_tag)
     endif()
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} status --porcelain=2
+        COMMAND git status --porcelain=2
         OUTPUT_VARIABLE git_status
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -61,7 +55,7 @@ function(make_release_commit_and_tag)
     endif()
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag --sort=-v:refname
+        COMMAND git tag --sort=-v:refname
         OUTPUT_VARIABLE git_tags
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -82,7 +76,7 @@ function(make_release_commit_and_tag)
     endif()
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} log ${git_last_tag}.. "--pretty=format:* %h - %s [%aL]"
+        COMMAND git log ${git_last_tag}.. "--pretty=format:* %h - %s [%aL]"
         OUTPUT_VARIABLE release_log
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -92,17 +86,17 @@ function(make_release_commit_and_tag)
 
     if(TAG_RELEASE STREQUAL UNDO)
         execute_process(
-            COMMAND ${GIT_EXECUTABLE} tag -d ${git_last_tag}
+            COMMAND git tag -d ${git_last_tag}
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         )
 
         execute_process(
-            COMMAND ${GIT_EXECUTABLE} reset HEAD~1
+            COMMAND git reset HEAD~1
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         )
 
         execute_process(
-            COMMAND ${GIT_EXECUTABLE} checkout HEAD CHANGELOG.md
+            COMMAND git checkout HEAD CHANGELOG.md
             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         )
 
@@ -186,10 +180,12 @@ Ignore the following cmake error.
     endwhile()
 
     # Convert to UNIX line endings on Windows, just copy the file otherwise.
-
     if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32))
+        if(NOT DEFINED POWERSHELL)
+            message(FATAL_ERROR "Powershell is required to convert line endings on Windows.")
+        endif()
         execute_process(
-            COMMAND powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
+            COMMAND ${POWERSHELL} -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
                 $text = [IO.File]::ReadAllText("CHANGELOG.md.work") -replace "`r`n", "`n"
                 [IO.File]::WriteAllText("CHANGELOG.md", $text)
             ]=]
@@ -212,45 +208,37 @@ Ignore the following cmake error.
     )
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} add CHANGELOG.md
+        COMMAND git add CHANGELOG.md
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
 
-    # Make the release commit.
+    message(FATAL_ERROR "
 
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} commit -m "release ${new_tag}" --signoff -S
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
+Release prepared.
 
-    # Make release tag.
+Edit CHANGELOG.md to remove any non-user-facing commits, and optionally add any
+release notes.
 
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag -s -m${new_tag} ${new_tag}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
+Run the following commands to commit the change:
 
-    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 ****
+    git commit -a -m'release ${new_tag}' --signoff -S
+    git tag -s -m'${new_tag}' ${new_tag}
 
 To rollback these changes, run this command:
 
     cmake .. -DTAG_RELEASE=UNDO
 
-Ignore the "configuration incomplete" message following, this mode does not
+==== 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
 build anything.
 
-]=])
+")
 endfunction()
 
 make_release_commit_and_tag()

cmake/MetalShaderSupport.cmake

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

cmake/Options.cmake

@@ -0,0 +1,218 @@
+option(BUILD_TESTING "Build testing" ON)
+option(BUILD_SHARED_LIBS "Build dynamic libraries" OFF)
+
+option(TRANSLATIONS_ONLY "Build only the translations.zip" OFF)
+if(TRANSLATIONS_ONLY)
+    set(BUILD_DEFAULT OFF)
+else()
+    set(BUILD_DEFAULT ON)
+endif()
+
+set(ENABLE_SDL_DEFAULT ${BUILD_DEFAULT})
+
+if(WIN32 OR APPLE)
+    set(ENABLE_SDL_DEFAULT OFF)
+endif()
+
+# Static linking
+set(VBAM_STATIC_DEFAULT OFF)
+if(VCPKG_TARGET_TRIPLET MATCHES -static OR CMAKE_TOOLCHAIN_FILE MATCHES "mxe|-static")
+    set(VBAM_STATIC_DEFAULT ON)
+elseif(MINGW OR MSYS)
+    # Default to static builds on MinGW and all MSYS2 envs.
+    set(VBAM_STATIC_DEFAULT ON)
+endif()
+option(VBAM_STATIC "Try to link all libraries statically" ${VBAM_STATIC_DEFAULT})
+
+if(VBAM_STATIC)
+    set(SDL2_STATIC ON)
+    set(SDL3_STATIC ON)
+    set(SFML_STATIC_LIBRARIES ON)
+    set(FFMPEG_STATIC ON)
+    set(OPENAL_STATIC ON)
+    set_property(GLOBAL PROPERTY LINK_SEARCH_START_STATIC ON)
+    set_property(GLOBAL PROPERTY LINK_SEARCH_END_STATIC   ON)
+
+    if(MSVC)
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .lib)
+    else()
+        list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .a)
+    endif()
+endif()
+
+if(CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^([xX]86_64|[aA][mM][dD]64)$")
+   set(PKG_CONFIG_EXECUTABLE "$ENV{VCPKG_ROOT}/installed/x64-windows/tools/pkgconf/pkgconf.exe")
+endif()
+
+find_package(PkgConfig)
+
+if(UNIX AND NOT APPLE)
+    pkg_check_modules(SDL3 sdl3 QUIET)
+else()
+    find_package(SDL3 QUIET)
+endif()
+
+option(ENABLE_SDL3 "Use SDL3" "${SDL3_FOUND}")
+
+if(NOT TRANSLATIONS_ONLY)
+    if(ENABLE_SDL3)
+        if(NOT UNIX)
+            find_package(SDL3 REQUIRED)
+        endif()
+    else()
+        find_package(SDL2 REQUIRED)
+    endif()
+endif()
+
+option(ENABLE_GENERIC_FILE_DIALOGS "Use generic file dialogs" OFF)
+option(DISABLE_OPENGL "Disable OpenGL" OFF)
+option(ENABLE_SDL "Build the SDL port" ${ENABLE_SDL_DEFAULT})
+option(ENABLE_WX "Build the wxWidgets port" ${BUILD_DEFAULT})
+option(ENABLE_DEBUGGER "Enable the debugger" ON)
+option(ENABLE_ASAN "Enable -fsanitize=address by default. Requires debug build with GCC/Clang" OFF)
+option(ENABLE_BZ2 "Enable BZ2 archive support" ON)
+option(ENABLE_LZMA "Enable LZMA archive support" ON)
+
+if(ENABLE_SDL3)
+   set(CMAKE_C_FLAGS "-DENABLE_SDL3 ${CMAKE_C_FLAGS}")
+   set(CMAKE_CXX_FLAGS "-DENABLE_SDL3 ${CMAKE_CXX_FLAGS}")
+endif()
+
+if(DISABLE_OPENGL)
+   set(CMAKE_C_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_C_FLAGS}")
+   set(CMAKE_CXX_FLAGS "-DNO_OPENGL -DNO_OGL ${CMAKE_CXX_FLAGS}")
+endif()
+
+option(ENABLE_ASM "Enable x86 ASM related options" OFF)
+
+# The ARM ASM core seems to be very buggy, see #98 and #54. Default to it being
+# OFF for the time being, until it is either fixed or replaced.
+option(ENABLE_ASM_CORE "Enable x86 ASM CPU cores (EXPERIMENTAL)" OFF)
+
+set(ASM_SCALERS_DEFAULT ${ENABLE_ASM})
+set(MMX_DEFAULT ${ENABLE_ASM})
+
+option(ENABLE_ASM_SCALERS "Enable x86 ASM graphic filters" ${ASM_SCALERS_DEFAULT})
+
+include(CMakeDependentOption)
+cmake_dependent_option(ENABLE_MMX "Enable MMX" ${MMX_DEFAULT} "ENABLE_ASM_SCALERS" OFF)
+
+option(ENABLE_LIRC "Enable LIRC support" OFF)
+
+# Add support for Homebrew, MacPorts and Fink on macOS
+option(DISABLE_MACOS_PACKAGE_MANAGERS "Set to TRUE to disable support for macOS Homebrew, MacPorts and Fink." FALSE)
+if(APPLE AND NOT DISABLE_MACOS_PACKAGE_MANAGERS)
+    include(MacPackageManagers)
+endif()
+
+# Link / SFML
+if(NOT TRANSLATIONS_ONLY)
+    set(ENABLE_LINK_DEFAULT ON)
+endif()
+option(ENABLE_LINK "Enable GBA linking functionality" ${ENABLE_LINK_DEFAULT})
+
+# FFMpeg
+set(FFMPEG_DEFAULT OFF)
+set(FFMPEG_COMPONENTS         AVFORMAT            AVCODEC            SWSCALE          AVUTIL            SWRESAMPLE          X264    X265)
+set(FFMPEG_COMPONENT_VERSIONS AVFORMAT>=58.12.100 AVCODEC>=58.18.100 SWSCALE>=5.1.100 AVUTIL>=56.14.100 SWRESAMPLE>=3.1.100 X264>=0 X265>=0)
+
+if(NOT TRANSLATIONS_ONLY AND (NOT DEFINED ENABLE_FFMPEG OR ENABLE_FFMPEG))
+    set(FFMPEG_DEFAULT ON)
+
+    find_package(FFmpeg COMPONENTS ${FFMPEG_COMPONENTS})
+
+    # check versions, but only if pkgconfig is available
+    if(FFmpeg_FOUND AND PKG_CONFIG_FOUND AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
+        foreach(component ${FFMPEG_COMPONENT_VERSIONS})
+            string(REPLACE ">=" ";" parts ${component})
+            list(GET parts 0 name)
+            list(GET parts 1 version)
+
+            if((NOT DEFINED ${name}_VERSION) OR ${name}_VERSION VERSION_LESS ${version})
+                set(FFmpeg_FOUND OFF)
+            endif()
+        endforeach()
+    endif()
+
+    if(NOT FFmpeg_FOUND)
+        set(FFMPEG_DEFAULT OFF)
+    endif()
+endif()
+option(ENABLE_FFMPEG "Enable ffmpeg A/V recording" ${FFMPEG_DEFAULT})
+
+# Online Updates
+set(ONLINEUPDATES_DEFAULT OFF)
+if(DEFINED(UPSTREAM_RELEASE) AND UPSTREAM_RELEASE)
+    set(ONLINEUPDATES_DEFAULT ON)
+endif()
+option(ENABLE_ONLINEUPDATES "Enable online update checks" ${ONLINEUPDATES_DEFAULT})
+option(HTTPS "Use https URL for winsparkle" ON)
+
+# We generally don't want LTO when debugging because it makes linking slow
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(LTO_DEFAULT OFF)
+else()
+    set(LTO_DEFAULT ON)
+endif()
+option(ENABLE_LTO "Compile with Link Time Optimization" ${LTO_DEFAULT})
+
+option(ENABLE_GBA_LOGGING "Enable extended GBA logging" ON)
+
+option(UPSTREAM_RELEASE "do some optimizations and release automation tasks" OFF)
+
+if(WIN32)
+    # not yet implemented
+    option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
+
+    set(XAUDIO2_DEFAULT ON)
+    if ((MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) OR (MINGW AND X86))
+        # TODO: We should update the XAudio headers to build with clang-cl. See
+        # https://github.com/visualboyadvance-m/visualboyadvance-m/issues/1021
+        set(XAUDIO2_DEFAULT OFF)
+    endif()
+    option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ${XAUDIO2_DEFAULT})
+endif()
+
+find_package(OpenAL QUIET)
+
+set(OPENAL_DEFAULT ${OpenAL_FOUND})
+
+if(MINGW AND X86)
+    # OpenAL-Soft uses avrt.dll which is not available on Windows XP.
+    set(OPENAL_DEFAULT OFF)
+endif()
+
+option(ENABLE_OPENAL "Enable OpenAL-Soft sound output for the wxWidgets port" ${OPENAL_DEFAULT})
+
+set(ENABLE_FAUDIO_DEFAULT OFF)
+
+find_package(FAudio QUIET)
+
+if(FAudio_FOUND AND NOT (MINGW AND X86))
+    set(ENABLE_FAUDIO_DEFAULT ON)
+endif()
+
+option(ENABLE_FAUDIO "Enable FAudio sound output for the wxWidgets port" ${ENABLE_FAUDIO_DEFAULT})
+
+option(ZIP_SUFFIX [=[suffix for release zip files, e.g.  "-somebranch".zip]=] OFF)
+
+# The SDL port can't be built without debugging support
+if(NOT ENABLE_DEBUGGER AND ENABLE_SDL)
+    message(FATAL_ERROR "The SDL port can't be built without debugging support")
+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)
+
+if(APPLE)
+   set(wx_mac_patched_default OFF)
+
+   if(UPSTREAM_RELEASE)
+      set(wx_mac_patched_default ON)
+   endif()
+
+   option(WX_MAC_PATCHED "A build of wxWidgets that is patched for the alert sound bug is being used" ${wx_mac_patched_default})
+endif()

cmake/PathRun.cmake

@@ -1,16 +0,0 @@
-function(make_path_run_wrapper cmd target)
-    get_filename_component(name "${target}" NAME)
-    get_filename_component(cmd_resolved "${cmd}" REALPATH)
-    get_filename_component(base_name "${cmd_resolved}" NAME)
-    get_filename_component(dir_name  "${cmd_resolved}" DIRECTORY)
-
-    set(source "${target}.c")
-
-    configure_file(src/gcc-wrap.c.in "${source}")
-
-    include(HostCompile)
-    host_compile("${source}" "${target}")
-
-    add_custom_target(generate_${name} DEPENDS "${CMAKE_BINARY_DIR}/${name}")
-    add_dependencies(generate generate_${name})
-endfunction()

cmake/Set-Toolchain-vcpkg.cmake

@@ -1,9 +1,5 @@
-if(POLICY CMP0012)
-    cmake_policy(SET CMP0012 NEW) # Saner if() behavior.
-endif()
-
-if(POLICY CMP0135)
-    cmake_policy(SET CMP0135 NEW) # Use timestamps from archives.
+if(TRANSLATIONS_ONLY)
+    return()
 endif()
 
 if(NOT DEFINED VCPKG_TARGET_TRIPLET)
@@ -14,19 +10,27 @@ 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" CACHE STRING "Vcpkg host triplet" FORCE)
+                        set(VCPKG_USE_HOST_TOOLS ON CACHE BOOL "Use vcpkg host tools" FORCE)
+                    endif()
+                endforeach()
+
                 break()
             endif()
         endforeach()
@@ -79,7 +83,7 @@ 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 "^C:/Program Files/Microsoft Visual Studio/")
+    if(NOT git_status EQUAL 0 AND NOT VCPKG_ROOT MATCHES "Visual Studio")
         message(FATAL_ERROR "Error updating vcpkg from git, please make sure git for windows is installed correctly, it can be installed from Visual Studio components")
     endif()
 endfunction()
@@ -146,24 +150,16 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
     string(REPLACE "-" "." pkg_ver ${pkg_ver})
 
     if(NOT DEFINED VCPKG_INSTALLED_COUNT)
-        if(VCPKG_ROOT MATCHES "^C:/Program Files/Microsoft Visual Studio/")
-            execute_process(
-                COMMAND ${powershell}
-                    -executionpolicy bypass -noprofile
-                    -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list"
-                OUTPUT_VARIABLE vcpkg_list_text
-            )
-        else()
-            execute_process(
-                COMMAND ${vcpkg_exe} list
-                OUTPUT_VARIABLE vcpkg_list_text
-                ERROR_QUIET
-            )
-        endif()
+        execute_process(
+            COMMAND ${powershell}
+                -executionpolicy bypass -noprofile
+                -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-list"
+            OUTPUT_VARIABLE vcpkg_list_text
+        )
 
         string(REGEX REPLACE "\r?\n" ";" vcpkg_list_raw "${vcpkg_list_text}")
 
-        set(VCPKG_INSTALLED_COUNT 0 PARENT_SCOPE)
+        set(VCPKG_INSTALLED_COUNT 0 CACHE INTERNAL "Number of installed vcpkg packages" FORCE)
         foreach(pkg ${vcpkg_list_raw})
             if(NOT pkg MATCHES "^([^:[]+)[^:]*:([^ ]+) +([0-9][^ ]*) +.*\$")
                 continue()
@@ -185,8 +181,8 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
             list(APPEND VCPKG_INSTALLED ${inst_pkg_name} ${inst_pkg_ver} ${inst_pkg_rev} ${inst_pkg_triplet})
             math(EXPR VCPKG_INSTALLED_COUNT "${VCPKG_INSTALLED_COUNT} + 1")
         endforeach()
-        set(VCPKG_INSTALLED       ${VCPKG_INSTALLED}       PARENT_SCOPE)
-        set(VCPKG_INSTALLED_COUNT ${VCPKG_INSTALLED_COUNT} PARENT_SCOPE)
+        set(VCPKG_INSTALLED       ${VCPKG_INSTALLED}       CACHE INTERNAL "List of installed vcpkg packages"   FORCE)
+        set(VCPKG_INSTALLED_COUNT ${VCPKG_INSTALLED_COUNT} CACHE INTERNAL "Number of installed vcpkg packages" FORCE)
     endif()
 
     if(NOT VCPKG_INSTALLED_COUNT GREATER 0)
@@ -220,48 +216,79 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_ver pkg_triplet powershell ou
     endforeach()
 endfunction()
 
+function(get_triplet_package_list triplet)
+    if(EXISTS "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html")
+        return()
+    endif()
+
+    file(
+        DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
+        STATUS pkg_list_status
+    )
+    list(GET pkg_list_status 1 pkg_list_error)
+    list(GET pkg_list_status 0 pkg_list_status)
+
+    if(NOT pkg_list_status EQUAL 0)
+        message(STATUS "Failed to download vcpkg binary package list: ${pkg_list_status} - ${pkg_list_error}")
+        return()
+    endif()
+endfunction()
+
+function(download_package pkg pkgs_dir)
+    string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg})
+
+    message(STATUS "Downloading https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg} ...")
+
+    file(
+        DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg}" "${pkgs_dir}/${pkg}"
+        STATUS pkg_download_status
+    )
+    list(GET pkg_download_status 1 pkg_download_error)
+    list(GET pkg_download_status 0 pkg_download_status)
+
+    if(NOT pkg_download_status EQUAL 0)
+        message(STATUS "Failed to download vcpkg binary package '${pkg}': ${pkg_download_status} - ${pkg_download_error}")
+        return()
+    endif()
+
+    message(STATUS "done.")
+endfunction()
+
+function(zip_is_installed vcpkg_exe zip outvar)
+    if(NOT zip MATCHES "([^_]+)_([^_]+)_([^.]+)[.]zip")
+        return()
+    endif()
+    set(pkg_name    ${CMAKE_MATCH_1})
+    set(pkg_version ${CMAKE_MATCH_2})
+    set(pkg_triplet ${CMAKE_MATCH_3})
+
+    vcpkg_is_installed(${vcpkg_exe} ${pkg_name} ${pkg_version} ${pkg_triplet} ${POWERSHELL} pkg_installed)
+
+    set(${outvar} ${pkg_installed} PARENT_SCOPE)
+endfunction()
+
+function(cleanup_binary_packages)
+    file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/vcpkg-binary-packages")
+
+    unset(VCPKG_INSTALLED       CACHE)
+    unset(VCPKG_INSTALLED_COUNT CACHE)
+endfunction()
+
 function(get_binary_packages vcpkg_exe)
     set(binary_packages_installed FALSE PARENT_SCOPE)
 
-    unset(triplets)
-    unset(host_triplet)
-    # Determine host triplet for vcpkg build dependencies
-    if(WIN32)
-        if($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Rr][Mm]64")
-            set(host_triplet "arm64-windows")
-        elseif($ENV{PROCESSOR_ARCHITECTURE} MATCHES "[Aa][Mm][Dd]64|[Xx]64")
-            set(host_triplet "x64-windows")
-        else()
-            set(host_triplet "x86-windows")
-        endif()
+    get_triplet_package_list(${VCPKG_TARGET_TRIPLET})
+
+    if(NOT EXISTS "${CMAKE_BINARY_DIR}/binary_package_list_${VCPKG_TARGET_TRIPLET}.html")
+        message(STATUS "Failed to download binary package list found for triplet '${VCPKG_TARGET_TRIPLET}', aborting.")
+        return()
     endif()
-    if(DEFINED host_triplet)
-        list(APPEND triplets ${host_triplet})
-    endif()
-    list(APPEND triplets ${VCPKG_TARGET_TRIPLET})
 
-    foreach(triplet ${triplets})
-        file(
-            DOWNLOAD "https://nightly.vba-m.com/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html"
-            STATUS pkg_list_status
-        )
-        list(GET pkg_list_status 1 pkg_list_error)
-        list(GET pkg_list_status 0 pkg_list_status)
-
-        if(NOT pkg_list_status EQUAL 0)
-            message(STATUS "Failed to download vcpkg binary package list: ${pkg_list_status} - ${pkg_list_error}")
-            return()
-        endif()
-    endforeach()
-
-    unset(binary_packages)
-    foreach(triplet ${triplets})
-        file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" raw_html)
-        string(REGEX MATCHALL "<a href=\"[^\"]+[.]zip\"" links ${raw_html})
-        foreach(link ${links})
-            string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${link})
-            list(APPEND binary_packages ${pkg})
-        endforeach()
+    file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${VCPKG_TARGET_TRIPLET}.html" raw_html)
+    string(REGEX MATCHALL "<a href=\"[^\"]+[.]zip\"" links ${raw_html})
+    foreach(link ${links})
+        string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${link})
+        list(APPEND binary_packages ${pkg})
     endforeach()
 
     set(vcpkg_binpkg_dir ${CMAKE_BINARY_DIR}/vcpkg-binpkg)
@@ -274,25 +301,11 @@ function(get_binary_packages vcpkg_exe)
 
     FetchContent_GetProperties(vcpkg_binpkg)
     if(NOT vcpkg_binpkg_POPULATED)
-        FetchContent_Populate(vcpkg_binpkg)
+        FetchContent_MakeAvailable(vcpkg_binpkg)
     endif()
 
-    if(WIN32)
-        set(powershell powershell)
-    else()
-        set(powershell pwsh)
-    endif()
-
-    unset(to_install)
     foreach(pkg ${binary_packages})
-        if(NOT pkg MATCHES "([^_]+)_([^_]+)_([^.]+)[.]zip")
-            continue()
-        endif()
-        set(pkg_name    ${CMAKE_MATCH_1})
-        set(pkg_version ${CMAKE_MATCH_2})
-        set(pkg_triplet ${CMAKE_MATCH_3})
-
-        vcpkg_is_installed(${vcpkg_exe} ${pkg_name} ${pkg_version} ${pkg_triplet} ${powershell} pkg_installed)
+        zip_is_installed(${vcpkg_exe} ${pkg} pkg_installed)
 
         if(NOT pkg_installed)
             list(APPEND to_install ${pkg})
@@ -304,28 +317,84 @@ function(get_binary_packages vcpkg_exe)
         file(MAKE_DIRECTORY ${bin_pkgs_dir})
 
         foreach(pkg ${to_install})
-            string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg})
+            download_package("${pkg}" "${bin_pkgs_dir}")
 
-            message(STATUS "Downloading https://nightly.vba-m.com/vcpkg/${pkg_triplet}/${pkg} ...")
+            if(NOT EXISTS "${bin_pkgs_dir}/${pkg}")
+                message(STATUS "Failed to download package '${pkg}', aborting.")
+                return()
+            endif()
+        endforeach()
 
-            file(
-                DOWNLOAD "https://nightly.vba-m.com/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}"
-                STATUS pkg_download_status
+        unset(installed_host_deps)
+
+        while(TRUE)
+#                       -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-listmissing ."
+            execute_process(
+                COMMAND ${POWERSHELL}
+                    -executionpolicy bypass -noprofile
+                    -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-listmissing ."
+                WORKING_DIRECTORY ${bin_pkgs_dir}
+                OUTPUT_VARIABLE host_deps
+                RESULT_VARIABLE host_deps_status
             )
-            list(GET pkg_download_status 1 pkg_download_error)
-            list(GET pkg_download_status 0 pkg_download_status)
 
-            if(NOT pkg_download_status EQUAL 0)
-                message(STATUS "Failed to download vcpkg binary package '${pkg}': ${pkg_download_status} - ${pkg_download_error}")
+            if(NOT host_deps_status EQUAL 0)
+                message(STATUS "Failed to calculate host dependencies: ${host_deps_status}")
                 return()
             endif()
 
-            message(STATUS "done.")
-        endforeach()
+            string(REGEX REPLACE "\r?\n"   ";" host_deps "${host_deps}")
+            string(REGEX REPLACE " *;+ *$" ""  host_deps "${host_deps}")
+
+            list(LENGTH host_deps           host_deps_count)
+            list(LENGTH installed_host_deps installed_host_deps_count)
+
+            if(host_deps_count EQUAL installed_host_deps_count)
+                break()
+            endif()
+
+            foreach(host_dep ${host_deps})
+                if(NOT host_dep MATCHES "^([^:]+):([^:]+)\$")
+                    continue()
+                endif()
+                set(host_dep_name    ${CMAKE_MATCH_1})
+                set(host_dep_triplet ${CMAKE_MATCH_2})
+
+                get_triplet_package_list(${host_dep_triplet})
+
+                file(READ "${CMAKE_BINARY_DIR}/binary_package_list_${host_dep_triplet}.html" raw_html)
+                string(REGEX MATCHALL "<a href=\"${host_dep_name}_[^\"]+[.]zip\"" links ${raw_html})
+
+                list(LENGTH links links_count)
+
+                if(NOT links_count EQUAL 1)
+                    message(STATUS "Multiple host dependencies found for '${host_dep_name}' for triplet '${host_dep_triplet}', aborting.")
+                    return()
+                endif()
+
+                string(REGEX REPLACE "<a href=\"([^\"]+[.]zip)\"" "\\1" pkg ${links})
+
+                list(FIND installed_host_deps "${pkg}" found_idx)
+
+                if(found_idx EQUAL -1)
+                    zip_is_installed(${vcpkg_exe} ${pkg} pkg_installed)
+
+                    if(NOT pkg_installed)
+                        download_package("${pkg}" "${bin_pkgs_dir}")
+
+                        if(NOT EXISTS "${bin_pkgs_dir}/${pkg}")
+                            message(STATUS "Failed to download host dependency package '${pkg}', aborting.")
+                            return()
+                        endif()
+                    else()
+                        list(APPEND installed_host_deps "${pkg}")
+                    endif()
+                endif()
+            endforeach()
+        endwhile()
 
-#                -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-instpkg ."
         execute_process(
-            COMMAND ${powershell}
+            COMMAND ${POWERSHELL}
                 -executionpolicy bypass -noprofile
                 -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-instpkg ."
             WORKING_DIRECTORY ${bin_pkgs_dir}
@@ -334,6 +403,8 @@ function(get_binary_packages vcpkg_exe)
         file(REMOVE_RECURSE ${bin_pkgs_dir})
     endif()
 
+    cleanup_binary_packages()
+
     set(binary_packages_installed TRUE PARENT_SCOPE)
 endfunction()
 
@@ -356,8 +427,12 @@ function(vcpkg_remove_optional_deps vcpkg_exe)
 endfunction()
 
 function(vcpkg_set_toolchain)
+    get_filename_component(preferred_root ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
+
+    if(NOT DEFINED POWERSHELL)
+        message(FATAL_ERROR "Powershell is required to use vcpkg binaries.")
+    endif()
     if(NOT DEFINED ENV{VCPKG_ROOT})
-        get_filename_component(preferred_root ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
 
         if(WIN32)
             if(DEFINED ENV{CI} OR EXISTS /vcpkg)
@@ -388,6 +463,22 @@ function(vcpkg_set_toolchain)
         set(VCPKG_ROOT $ENV{VCPKG_ROOT})
     endif()
 
+    # Avoid using Visual Studio default vcpkg, because that requires elevaction.
+    if(VCPKG_ROOT MATCHES "Visual Studio")
+        set(mkdir_status 0)
+        if(NOT EXISTS "${preferred_root}")
+            file(
+                MAKE_DIRECTORY "${preferred_root}"
+                RESULT mkdir_status
+            )
+        endif()
+
+        if(mkdir_status EQUAL 0)
+            set(VCPKG_ROOT "${preferred_root}")
+            set(ENV{VCPKG_ROOT} ${VCPKG_ROOT})
+        endif()
+    endif()
+
     set(VCPKG_ROOT ${VCPKG_ROOT} CACHE FILEPATH "vcpkg installation root path" FORCE)
 
     if(NOT EXISTS ${VCPKG_ROOT})
@@ -472,6 +563,10 @@ function(vcpkg_set_toolchain)
 
     foreach(pkg ${VCPKG_DEPS})
         list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${VCPKG_TARGET_TRIPLET})
+
+        if(VCPKG_TARGET_TRIPLET STREQUAL "x86-mingw-static")
+            list(APPEND VCPKG_DEPS_QUALIFIED libsamplerate:x86-mingw-static)
+        endif()
     endforeach()
 
     if(WIN32)
@@ -480,13 +575,9 @@ function(vcpkg_set_toolchain)
         set(vcpkg_exe "${VCPKG_ROOT}/vcpkg")
     endif()
 
-    # update portfiles
-    execute_process(
-        COMMAND ${vcpkg_exe} update
-        WORKING_DIRECTORY ${VCPKG_ROOT}
-    )
-
-    get_binary_packages(${vcpkg_exe})
+    if (NOT (NO_VCPKG_UPDATES OR (NOT VCPKG_BINARY_PACKAGES)))
+        get_binary_packages(${vcpkg_exe})
+    endif()
 
     if(NOT binary_packages_installed)
         # Get number of seconds since midnight (might be wrong if am/pm is in effect on Windows.)
@@ -500,7 +591,7 @@ function(vcpkg_set_toolchain)
 
         # Install core deps.
         execute_process(
-            COMMAND ${vcpkg_exe} install ${VCPKG_DEPS_QUALIFIED}
+            COMMAND ${vcpkg_exe} --triplet ${VCPKG_TARGET_TRIPLET} install ${pkg}
             WORKING_DIRECTORY ${VCPKG_ROOT}
         )
 
@@ -542,7 +633,7 @@ function(vcpkg_set_toolchain)
                 set(dep_qualified "${dep}:${VCPKG_TARGET_TRIPLET}")
 
                 execute_process(
-                    COMMAND ${vcpkg_exe} install ${dep_qualified}
+                    COMMAND --triplet ${VCPKG_TARGET_TRIPLET} ${vcpkg_exe} install ${dep}
                     WORKING_DIRECTORY ${VCPKG_ROOT}
                 )
 
@@ -558,14 +649,10 @@ function(vcpkg_set_toolchain)
     endif()
 
     if(WIN32 AND NOT CMAKE_GENERATOR MATCHES "Visual Studio" AND NOT DEFINED CMAKE_CXX_COMPILER)
-        if(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-windows-")
+        if(VCPKG_TARGET_TRIPLET MATCHES "-windows-")
             # set toolchain to VS for e.g. Ninja or jom
             set(CMAKE_C_COMPILER   cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
             set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
-        elseif(VCPKG_TARGET_TRIPLET MATCHES "^x[68][46]-mingw-")
-            # set toolchain to MinGW for e.g. Ninja or jom
-            set(CMAKE_C_COMPILER   gcc CACHE STRING "MinGW GCC C Compiler"   FORCE)
-            set(CMAKE_CXX_COMPILER g++ CACHE STRING "MinGW G++ C++ Compiler" FORCE)
         endif()
     endif()
 
@@ -574,14 +661,4 @@ 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)

cmake/SetCompilerLinkerFlags.cmake

@@ -1,44 +0,0 @@
-include(VbamFunctions)
-
-function(add_compiler_flags)
-    foreach(var RELEASE DEBUG RELWITHDEBINFO MINSIZEREL)
-        set("CMAKE_CXX_FLAGS_${var}" "" CACHE STRING "MUST BE UNSET" FORCE)
-        set("CMAKE_CXX_FLAGS_${var}" "" PARENT_SCOPE)
-        set("CMAKE_C_FLAGS_${var}"   "" CACHE STRING "MUST BE UNSET" FORCE)
-        set("CMAKE_C_FLAGS_${var}"   "" PARENT_SCOPE)
-    endforeach()
-
-    # Set C and CXX flags if not already set.
-    foreach(flag ${ARGV})
-        foreach(var CMAKE_CXX_FLAGS CMAKE_C_FLAGS)
-            # Remove any duplicates first.
-            remove_dupes("${${var}}" "${var}")
-
-            string(FIND "${${var}}" "${flag}" found)
-
-            if(found EQUAL -1)
-                set("${var}" "${${var}} ${flag}" CACHE STRING "Compiler Flags" FORCE)
-                set("${var}" "${${var}} ${flag}" PARENT_SCOPE)
-            endif()
-        endforeach()
-    endforeach()
-endfunction()
-
-function(add_linker_flags)
-    # Set linker flags if not already set.
-    foreach(flag ${ARGV})
-        foreach(var EXE SHARED)
-            set(var "CMAKE_${var}_LINKER_FLAGS")
-
-            # Remove any duplicates first.
-            remove_dupes("${${var}}" "${var}")
-
-            string(FIND "${${var}}" "${flag}" found)
-
-            if(found EQUAL -1)
-                set("${var}" "${${var}} ${flag}" CACHE STRING "Linker Flags" FORCE)
-                set("${var}" "${${var}} ${flag}" PARENT_SCOPE)
-            endif()
-        endforeach()
-    endforeach()
-endfunction()

cmake/Toolchain-asan.cmake

@@ -0,0 +1,37 @@
+if(NOT ENABLE_ASAN)
+    return()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    check_cxx_compiler_flag(/fsanitize=address MSVC_ASAN_SUPPORTED)
+    if(MSVC_ASAN_SUPPORTED)
+        add_compile_options(/fsanitize=address)
+        add_compile_definitions(_DISABLE_VECTOR_ANNOTATION _DISABLE_STRING_ANNOTATION)
+    else()
+        message(WARNING "ASAN not available for the compiler, disabling.")
+        set(ENABLE_ASAN OFF)
+        return()
+    endif()
+else()
+    # ASAN does not work on non-debug builds for GCC and Clang.
+    if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
+        message(WARNING "ASAN requires debug build, set -DCMAKE_BUILD_TYPE=Debug, disabling.")
+        set(ENABLE_ASAN OFF)
+        return()
+    endif()
+
+    # It is necessary to modify the linker flagas for the compiler check to work.
+    set(BACKUP_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+    set(CMAKE_EXE_LINKER_FLAGS "-fsanitize=address")
+    check_cxx_compiler_flag(-fsanitize=address ASAN_SUPPORTED)
+    set(CMAKE_EXE_LINKER_FLAGS ${BACKUP_LINKER_FLAGS})
+
+    if(ASAN_SUPPORTED)
+        add_compile_options(-fsanitize=address)
+        add_link_options(-fsanitize=address)
+    else()
+        message(WARNING "ASAN not available for the compiler, disabling.")
+        set(ENABLE_ASAN OFF)
+        return()
+    endif()
+endif()

cmake/Toolchain-gcc-clang.cmake

@@ -0,0 +1,82 @@
+if(X86_32 OR X86_64)
+    add_compile_options(-msse2)
+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)
+    endif()
+endif()
+
+# Common flags.
+add_compile_options(
+    -pipe
+    $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy>
+    -Wformat
+    -Wformat-security
+    -fdiagnostics-color=always
+)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_compile_options(-Wno-unused-command-line-argument)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-feliminate-unused-debug-types)
+endif()
+
+# check if ssp flags are supported.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    check_cxx_compiler_flag(-fstack-protector-strong STACK_PROTECTOR_SUPPORTED)
+
+    if(STACK_PROTECTOR_SUPPORTED)
+        add_compile_options(-fstack-protector-strong)
+
+        check_cxx_compiler_flag("--param ssp-buffer-size=4" SSP_BUFFER_SIZE_SUPPORTED)
+        if(SSP_BUFFER_SIZE_SUPPORTED)
+            add_compile_options(--param ssp-buffer-size=4)
+        endif()
+    endif()
+endif()
+
+#add_compile_options(-std=c++14)
+
+if(NOT ENABLE_ASM) # inline asm is not allowed with -fPIC
+    add_compile_options(-fPIC)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(-ggdb3 -fno-omit-frame-pointer -Wall -Wextra)
+else()
+    add_compile_options(-O3 -ffast-math -fomit-frame-pointer)
+endif()
+
+# for some reason this is necessary
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    include_directories(/usr/local/include)
+endif()
+
+if(VBAM_STATIC)
+    if(APPLE)
+        add_link_options(-static-libstdc++)
+    else()
+        add_link_options(-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread)
+    endif()
+endif()
+
+# To support LTO, this must always fail.
+add_compile_options(-Werror=odr -Werror=strict-aliasing)
+add_link_options(   -Werror=odr -Werror=strict-aliasing)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-Werror=lto-type-mismatch)
+    add_link_options(   -Werror=lto-type-mismatch)
+endif()

cmake/Toolchain-mingw.cmake

@@ -0,0 +1,10 @@
+if (NOT MINGW)
+    return()
+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")
+
+# Add Winsock as the last library linked because of broken link precedence.
+set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -lws2_32")

cmake/Toolchain-msvc.cmake

@@ -0,0 +1,85 @@
+# Set the runtime library properly.
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:DEBUG>:Debug>" CACHE INTERNAL "")
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # MSVC-specific flags (not supported by clang-cl).
+    add_compile_options(/nologo)
+    if (NOT CMAKE_GENERATOR MATCHES "Ninja")
+        # Multi-processor compilation does not work well with Ninja.
+        add_compile_options(/MP)
+    endif()
+endif()
+
+include_directories("${CMAKE_SOURCE_DIR}/win32-deps/msvc")
+
+add_compile_definitions(
+    _FORCENAMELESSUNION
+    WIN32_LEAN_AND_MEAN
+    WIN32
+    _WINDOWS
+    __STDC_LIMIT_MACROS
+    __STDC_CONSTANT_MACROS
+    _CRT_SECURE_NO_WARNINGS
+    _UNICODE
+    UNICODE
+    WINVER=0x0A00
+    NTDDI_VERSION=0x0A000007
+    NOMINMAX
+)
+add_compile_options(
+    /W4
+    /GR
+    /EHsc
+)
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_definitions(_DEBUG)
+    add_compile_options(/Ob0 /Od /RTC1)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT ENABLE_ASAN)
+        # Use Edit and Continue with MSVC.
+        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "EditAndContinue" CACHE STRING "" FORCE)
+    else()
+        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "ProgramDatabase" CACHE STRING "" FORCE)
+    endif()
+else()
+    add_compile_options(/MT /Oi /Gy)
+    add_link_options(/OPT:REF /OPT:ICF)
+    set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "ProgramDatabase" CACHE STRING "" FORCE)
+
+    if (CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+        add_compile_options(/O1 /Ob1)
+    elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        add_compile_options(/O2 /Ob1)
+    else()
+        add_compile_options(/O2)
+    endif()
+endif()
+
+if(CMAKE_VERSION VERSION_LESS "3.25")
+    # Backwards-compatible way of setting the /Z option.
+    if(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "EditAndContinue")
+        add_compile_options(/ZI)
+    elseif(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "ProgramDatabase")
+        add_compile_options(/Zi)
+    elseif(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT STREQUAL "Embedded")
+        add_compile_options(/Z7)
+    else()
+        message(FATAL_ERROR "Unknown value for CMAKE_MSVC_DEBUG_INFORMATION_FORMAT: ${CMAKE_MSVC_DEBUG_INFORMATION_FORMAT}")
+    endif()
+endif()
+
+add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++17>)
+
+set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "" FORCE)
+
+# We need to explicitly set all of these to override the CMake defaults.
+set(CMAKE_CXX_FLAGS "" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS "" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE "" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)

cmake/Toolchain.cmake

@@ -0,0 +1,126 @@
+if(TRANSLATIONS_ONLY)
+    return()
+endif()
+
+# Compiler stuff
+include(CheckCXXCompilerFlag)
+
+include(ProcessorCount)
+ProcessorCount(num_cpus)
+
+if(ENABLE_LTO)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT LTO_SUPPORTED)
+
+    # MINGW64 does not support LTO
+    if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set(LTO_SUPPORTED FALSE)
+    endif()
+
+    if(LTO_SUPPORTED)
+        set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    else()
+        message(WARNING "LTO is not supported by the compiler, diasabling LTO")
+        set(ENABLE_LTO OFF)
+    endif()
+endif()
+
+# Output all binaries at top level
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+
+if(NOT HTTPS)
+    add_compile_definitions(NO_HTTPS)
+endif()
+
+if(ENABLE_GBA_LOGGING)
+    add_compile_definitions(GBA_LOGGING )
+endif()
+
+if(ENABLE_MMX)
+    add_compile_definitions(MMX)
+endif()
+
+
+if(NOT ENABLE_ONLINEUPDATES)
+  add_compile_definitions(NO_ONLINEUPDATES)
+endif()
+
+# The debugger is enabled by default
+if(ENABLE_DEBUGGER)
+    add_compile_definitions(VBAM_ENABLE_DEBUGGER)
+endif()
+
+# The ASM core is disabled by default because we don't know on which platform we are
+if(NOT ENABLE_ASM_CORE)
+    add_compile_definitions(C_CORE)
+endif()
+
+# Set up "src" and generated directory as a global include directory.
+set(VBAM_GENERATED_DIR ${CMAKE_BINARY_DIR}/generated)
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${VBAM_GENERATED_DIR}
+)
+
+# C defines
+add_compile_definitions(HAVE_NETINET_IN_H HAVE_ARPA_INET_H HAVE_ZLIB_H FINAL_VERSION SDL USE_OPENGL SYSCONF_INSTALL_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+add_compile_definitions(PKGDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/vbam")
+add_compile_definitions(__STDC_FORMAT_MACROS)
+add_compile_definitions(LOCALEDIR="${LOCALEDIR}")
+
+# Common compiler settings.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_definitions(DEBUG)
+else()
+    add_compile_definitions(NDEBUG)
+endif()
+
+if(APPLE)
+    add_compile_definitions(MACHO)
+elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
+    add_compile_definitions(ELF)
+endif()
+
+if(X86_64)
+    add_compile_definitions(__AMD64__ __X86_64__)
+endif()
+
+# Enable ASAN if requested and supported.
+include(Toolchain-asan)
+
+# MINGW/MSYS-specific settings.
+include(Toolchain-mingw)
+
+# Toolchain-specific settings.
+if(MSVC)
+    # This also includes clang-cl.
+    include(Toolchain-msvc)
+else()
+    include(Toolchain-gcc-clang)
+endif()
+
+# Assembler flags.
+if(ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS)
+    if(MSVC)
+        if(NOT EXISTS ${CMAKE_BINARY_DIR}/nuget.exe)
+            file(DOWNLOAD "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" ${CMAKE_BINARY_DIR}/nuget.exe)
+        endif()
+
+        execute_process(
+            COMMAND nuget.exe install nasm2 -OutputDirectory ${CMAKE_BINARY_DIR}/nuget
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        )
+
+        file(GLOB pkg ${CMAKE_BINARY_DIR}/nuget/nasm2*)
+
+        list(APPEND CMAKE_PROGRAM_PATH ${pkg}/tools)
+    endif()
+
+    enable_language(ASM_NASM)
+
+    set(ASM_ENABLED ON)
+endif()
+
+if(ASM_ENABLED)
+    string(REGEX REPLACE "<FLAGS>" "-I${CMAKE_SOURCE_DIR}/src/filters/hq/asm/ -O1 -w-orphan-labels" CMAKE_ASM_NASM_COMPILE_OBJECT ${CMAKE_ASM_NASM_COMPILE_OBJECT})
+endif()

cmake/UpdateAppcast.cmake

@@ -2,12 +2,6 @@
 # Update version in appcast.xml to latest tag.
 # Commit web-data.
 
-find_package(Git)
-
-if(NOT GIT_FOUND)
-    message(FATAL_ERROR "git is required to update the appcast")
-endif()
-
 function(update_appcast)
     if(UPDATE_APPCAST STREQUAL UNDO)
 	file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/web-data)
@@ -22,7 +16,7 @@ Ignore the following cmake error.
     # Get last tag.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag --sort=-v:refname
+        COMMAND git tag --sort=-v:refname
         OUTPUT_VARIABLE git_tags
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -49,7 +43,7 @@ Ignore the following cmake error.
     # Clone repo.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
+        COMMAND git clone git@github.com:visualboyadvance-m/visualboyadvance-m.github.io web-data
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
 
@@ -81,10 +75,12 @@ Ignore the following cmake error.
     endwhile()
 
     # Convert to UNIX line endings on Windows, just copy the file otherwise.
-
     if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32))
+        if(NOT DEFINED POWERSHELL)
+            message(FATAL_ERROR "Powershell is required to convert line endings on Windows.")
+        endif()
         execute_process(
-            COMMAND powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
+            COMMAND ${POWERSHELL} -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
                 $text = [IO.File]::ReadAllText("appcast.xml.work") -replace "`r`n", "`n"
                 [IO.File]::WriteAllText("appcast.xml", $text)
             ]=]
@@ -107,21 +103,21 @@ Ignore the following cmake error.
     )
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} add appcast.xml
+        COMMAND git add appcast.xml
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 
     # Commit the change.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} commit -m "release ${new_tag}" --signoff -S
+        COMMAND git commit -m "release ${new_tag}" --signoff -S
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 
     # Make release tag.
 
     execute_process(
-        COMMAND ${GIT_EXECUTABLE} tag -s -m${new_tag} ${new_tag}
+        COMMAND git tag -s -m${new_tag} ${new_tag}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/web-data
     )
 

cmake/UseGCCBinUtilsWrappers.cmake

@@ -1,103 +0,0 @@
-# UseGCCBinUtilsWrappers.cmake
-#
-# Use gcc binutils wrappers such as gcc-ar, this may be necessary for LTO.
-#
-# To use:
-#
-# put a copy into your <project_root>/CMakeScripts/
-#
-# In your main CMakeLists.txt add the command:
-#
-# INCLUDE(UseGCCBinUtilsWrappers)
-#
-# BSD 2-Clause License
-#
-# Copyright (c) 2016, Rafael Kitover
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# only do this when compiling with gcc/g++
-IF(NOT (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC))
-    RETURN()
-ENDIF()
-
-# first try appending -util to basename of compiler
-STRING(REGEX MATCH   "\\.(exe|EXE)$"    GCC_EXE_SUFFIX ${CMAKE_C_COMPILER})
-STRING(REGEX REPLACE "\\.(exe|EXE)$" "" GCC_BASENAME   ${CMAKE_C_COMPILER})
-
-SET(GCC_AR      "${GCC_BASENAME}-ar${GCC_EXE_SUFFIX}")
-SET(GCC_NM      "${GCC_BASENAME}-nm${GCC_EXE_SUFFIX}")
-SET(GCC_RANLIB  "${GCC_BASENAME}-ranlib${GCC_EXE_SUFFIX}")
-
-# if that does not work, try looking for gcc-util in the compiler directory,
-# and failing that in the PATH
-
-GET_FILENAME_COMPONENT(GCC_DIRNAME ${CMAKE_C_COMPILER} DIRECTORY)
-
-IF(NOT EXISTS ${GCC_AR})
-    UNSET(GCC_AR)
-
-    FIND_PROGRAM(GCC_AR NAMES gcc-ar gcc-ar.exe GCC-AR.EXE HINTS ${GCC_DIRNAME})
-ENDIF()
-
-IF(NOT EXISTS ${GCC_NM})
-    UNSET(GCC_NM)
-
-    FIND_PROGRAM(GCC_NM NAMES gcc-nm gcc-nm.exe GCC-NM.EXE HINTS ${GCC_DIRNAME})
-ENDIF()
-
-IF(NOT EXISTS ${GCC_RANLIB})
-    UNSET(GCC_RANLIB)
-
-    FIND_PROGRAM(GCC_RANLIB NAMES gcc-ranlib gcc-ranlib.exe GCC-RANLIB.EXE HINTS ${GCC_DIRNAME})
-ENDIF()
-
-INCLUDE(PathRun)
-
-IF(EXISTS ${GCC_AR})
-    MESSAGE("-- Found gcc-ar: ${GCC_AR}")
-
-    SET(target "${CMAKE_BINARY_DIR}/gcc-ar-wrap")
-    MAKE_PATH_RUN_WRAPPER("${GCC_AR}" "${target}")
-    SET(CMAKE_AR "${target}")
-ENDIF()
-
-IF(EXISTS ${GCC_NM})
-    MESSAGE("-- Found gcc-nm: ${GCC_NM}")
-
-    SET(target "${CMAKE_BINARY_DIR}/gcc-nm-wrap")
-    MAKE_PATH_RUN_WRAPPER("${GCC_NM}" "${target}")
-    SET(CMAKE_NM "${target}")
-ENDIF()
-
-IF(EXISTS ${GCC_RANLIB})
-    MESSAGE("-- Found gcc-ranlib: ${GCC_RANLIB}")
-
-    SET(target "${CMAKE_BINARY_DIR}/gcc-ranlib-wrap")
-    MAKE_PATH_RUN_WRAPPER("${GCC_RANLIB}" "${target}")
-    SET(CMAKE_RANLIB "${target}")
-ENDIF()
-
-FOREACH(VAR "GCC_AR" "GCC_NM" "GCC_RANLIB" "GCC_DIRNAME" "GCC_BASENAME" "GCC_EXE_SUFFIX" "target")
-    UNSET(${VAR})
-ENDFOREACH()

cmake/VbamFunctions.cmake

@@ -1,48 +1,3 @@
-# From: https://stackoverflow.com/a/41416298/262458
-function(REMOVE_DUPES ARG_STR OUTPUT)
-  set(ARG_LIST ${ARG_STR})
-  separate_arguments(ARG_LIST)
-  list(REMOVE_DUPLICATES ARG_LIST)
-  string (REGEX REPLACE "([^\\]|^);" "\\1 " _TMP_STR "${ARG_LIST}")
-  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-# From: https://stackoverflow.com/a/7216542
-function(JOIN VALUES GLUE OUTPUT)
-  string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
-  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-# On MSYS2 transform wx lib paths to native paths for Ninja.
-function(normalize_wx_paths)
-    if(MSYS)
-        set(libs "")
-
-        foreach(lib ${wxWidgets_LIBRARIES})
-            if(NOT lib MATCHES "^(-Wl,|-mwindows$|-pipe$)")
-                if(lib MATCHES "^/")
-                    cygpath(lib "${lib}")
-                endif()
-
-                if(VBAM_STATIC AND lib MATCHES "^-l(wx.*|jpeg|tiff|jbig|lzma|expat)$")
-                    cygpath(lib "$ENV{MSYSTEM_PREFIX}/lib/lib${CMAKE_MATCH_1}.a")
-                endif()
-
-                list(APPEND libs "${lib}")
-            endif()
-        endforeach()
-
-        set(wxWidgets_LIBRARIES "${libs}" PARENT_SCOPE)
-    endif()
-endfunction()
-
-macro(cleanup_wx_vars)
-    if(wxWidgets_CXX_FLAGS)
-        list(REMOVE_ITEM wxWidgets_CXX_FLAGS -fpermissive)
-    endif()
-endmacro()
 
 function(cygpath var path)
     execute_process(
@@ -82,8 +37,48 @@ function(check_clean_exit var)
     set(${var} ${exit_status} PARENT_SCOPE)
 endfunction()
 
+function(try_wx_util var util conf_suffix major_version minor_version)
+    unset(suffix)
+    if(conf_suffix)
+        set(suffix "-${conf_suffix}")
+    endif()
+    if(major_version)
+        set(suffix "${suffix}-${major_version}")
+
+        if(NOT minor_version EQUAL -1)
+            set(suffix "${suffix}.${minor_version}")
+        endif()
+    endif()
+
+    # find_program caches the result
+    set(exe NOTFOUND CACHE INTERNAL "" FORCE)
+    find_program(exe NAMES "${util}${suffix}")
+
+    # try infix variant, as on FreeBSD
+    if(NOT EXISTS "${exe}")
+        string(REGEX REPLACE "^-" "" suffix "${suffix}")
+
+        string(REGEX REPLACE "-" "${suffix}-" try "${util}")
+
+        set(exe NOTFOUND CACHE INTERNAL "" FORCE)
+        find_program(exe NAMES "${try}")
+    endif()
+
+    if(EXISTS "${exe}")
+        # check that the utility can be executed cleanly
+        # in case we find e.g. the wrong architecture binary
+        # when cross-compiling
+        check_clean_exit(exit_status "${exe}" --help)
+
+        if(exit_status EQUAL 0)
+            set("${var}" "${exe}" PARENT_SCOPE)
+            return()
+        endif()
+    endif()
+endfunction()
+
 function(find_wx_util var util)
-    if(WIN32 OR EXISTS /etc/gentoo-release)
+    if((WIN32 AND (NOT CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")) OR EXISTS /etc/gentoo-release)
         # On win32, including cross builds we prefer the plain utility
         # name first from PATH, with the exception of -static for static
         # builds.
@@ -102,48 +97,34 @@ function(find_wx_util var util)
         set(major_versions ";")
     endif()
 
-    list(APPEND conf_suffixes  gtk4u gtk4 gtk3u gtk3 gtk2u gtk2 "")
-    list(APPEND major_versions 4 3 2 "")
+    list(APPEND conf_suffixes  "" gtk3u gtk3 gtk2u gtk2)
+    list(APPEND major_versions "" 3)
+
+    get_target_property(wx_base_lib_prop wx::base LOCATION)
+    string(STRIP "${wx_base_lib_prop}" wx_base_lib)
+
+    if(wx_base_lib MATCHES "wx_baseu?-([0-9]+)\\.([0-9]+)\\.")
+        set(lib_major "${CMAKE_MATCH_1}")
+        set(lib_minor "${CMAKE_MATCH_2}")
+    endif()
 
     foreach(conf_suffix IN LISTS conf_suffixes)
+        if(lib_major AND lib_minor)
+            try_wx_util(exe "${util}" "${conf_suffix}" "${lib_major}" "${lib_minor}")
+
+            if(exe)
+                set("${var}" "${exe}" PARENT_SCOPE)
+                return()
+            endif()
+        endif()
+
         foreach(major_version IN LISTS major_versions)
-            foreach(minor_version RANGE 100 -1 -1)
-                unset(suffix)
-                if(conf_suffix)
-                    set(suffix "-${conf_suffix}")
-                endif()
-                if(major_version)
-                    set(suffix "${suffix}-${major_version}")
+            foreach(minor_version RANGE 30 -1 -1)
+                try_wx_util(exe "${util}" "${conf_suffix}" "${major_version}" "${minor_version}")
 
-                    if(NOT minor_version EQUAL -1)
-                        set(suffix "${suffix}.${minor_version}")
-                    endif()
-                endif()
-
-                # find_program caches the result
-                set(exe NOTFOUND CACHE INTERNAL "" FORCE)
-                find_program(exe NAMES "${util}${suffix}")
-
-                # try infix variant, as on FreeBSD
-                if(NOT EXISTS ${exe})
-                    string(REGEX REPLACE "^-" "" suffix "${suffix}")
-
-                    string(REGEX REPLACE "-" "${suffix}-" try ${util})
-
-                    set(exe NOTFOUND CACHE INTERNAL "" FORCE)
-                    find_program(exe NAMES ${try})
-                endif()
-
-                if(EXISTS ${exe})
-                    # check that the utility can be executed cleanly
-                    # in case we find e.g. the wrong architecture binary
-                    # when cross-compiling
-                    check_clean_exit(exit_status ${exe} --help)
-
-                    if(exit_status EQUAL 0)
-                        set(${var} ${exe} PARENT_SCOPE)
-                        return()
-                    endif()
+                if(exe)
+                    set("${var}" "${exe}" PARENT_SCOPE)
+                    return()
                 endif()
 
                 # don't iterate over minor versions for empty major version
@@ -157,5 +138,3 @@ function(find_wx_util var util)
         set(${var} ${util} PARENT_SCOPE)
     endforeach()
 endfunction()
-
-# vim:sw=4 sts et:

cmake/doctest.cmake

@@ -1,175 +0,0 @@
-# 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
-)

cmake/doctestAddTests.cmake

@@ -1,81 +0,0 @@
-# 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}")

default.nix

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

dependencies

@@ -1 +0,0 @@
-Subproject commit e8ce758a98161d47559aa294d3298425ec75e28e

doc/DevInfo.txt

@@ -2,59 +2,27 @@
 Developer Information File
 ==========================
 
-
-
 Known preprocessor switches:
 - SDL: Defined for the SDL version
 - GBA_LOGGING: Enables logging for the GBA core
 - FINAL_VERSION: Defined for release versions, disables additional GBA logging and completely disables GB logging. Increases the amount of CPU cycles being emulated in one go.
-- BKPT_SUPPORT
+- VBAM_ENABLE_DEBUGGER: Enable remote debugging support
 - MMX: Enable MMX instruction set
-- NO_ASM: Use C++ version of hq3x/4x filters
 - RGB555: Use 16bit colors with 5bit green instead of 6bit green in hq3x/4x filters (C++ version)
 - NO_OGL: Exclude OpenGL code
 - NO_D3D: Exclude Direct3D code
-- NO_OAL: Exclude OpenAL code
-- NO_XAUDIO2: Exclude XAudio2 code (the XAudio2 interface is DirectSound's successor)
+- VBAM_ENABLE_XAUDIO2: Enable XAudio2 code (the XAudio2 interface is DirectSound's successor)
+- VBAM_ENABLE_FAUDIO: Enable FAudio code (the FAudio interface is an open source multiplatform re-implementation of XAudio2)
 - NO_LINK: Exclude linking code (joybus, multilink, ...)
-- WIN64: This macro is only defined for 64 bit builds
-
-
-
-Download locations:
-NASM:         http://nasm.us/
-DirectX SDK:  http://msdn.microsoft.com/en-us/xna/aa937788.aspx
-OpenAL SDK:   http://connect.creativelabs.com/openal/default.aspx
-OpenGL files: http://www.opengl.org/registry/
-zlib:         http://zlib.net/
-libpng:       http://libpng.org/pub/png/libpng.html
-
-You can find pre-built versions of zlib & libpng at:
-http://spacy51.sp.funpic.de/VBA-M/libs/
-Just extract them somewhere and point Visual C++ 2008 to the include & lib folders.
-They are built with the static C runtime (this is what the release builds use).
-
-
 
 ###########################
 #  --- Build Systems  --- #
 ###########################
 
-===Win32/MFC===
-This is the full-featured Windows build using the MFC GUI.
-The project files are located in /project/vc2008_mfc (VBA2008.sln) and /project/vs2010_mfc (VBA2010.sln).
-Anyone distributing builds should be using MSVC 2010 SP1, the unpatched release has a bug where it applies SSE2 updates to mov and other instructions resulting in illegal instruction errors on cpu's only supporting SSE.
-You also have to install Microsoft's DirectX SDK for Direct3D, DirectInput & XAudio2.
-If you want to enable OpenAL sound output, install the OpenAL SDK. If you do not want it, add NO_OAL to the VBA-M project's preprocessor definitions.
-SubWCRev.exe is used to append the svn versioning to the output executable, this as of TortoiseSVN 1.7, is only available by installing TortoiseSVN.
-All other dependencies for MSVC builds may be found in the ../dependencies directory (above /trunk).
-Normally, Windows users will want to checkout the root of the repository instead of just the trunk directory. Afterwards, simply opening the .sln of choice, setting preprocessor definitions, and hitting build is all that's required.
-
-===*nix/GTK===
+===src/sdl===
 This is the standard build configuration on non-Windows.
 Running cmake will inform you of any packages you need to install.
 
-===*/wxw===
-The wxWidgets interface is an in-development frontend meant to be more cross-platform friendly than MFC and GTK.
+===src/wx===
+The wxWidgets interface is an in-development frontend meant to be more cross-platform friendly than MFC and SDL.
 Running cmake will inform you of any packages you need to install.
-NOTE: In addition to what cmake currently checks for, you will also need the wxrc tool and libgdiplus.

doc/ReadMe.MFC.txt

@@ -9,7 +9,7 @@
 
 VisualBoyAdvance-M
 Nintendo Game Boy & Game Boy Advance Emulator
-Project Homepage: http://vba-m.com
+Project Homepage: http://visualboyadvance-m.org
 
 This program is distributed under the GNU General Public License
 http://www.gnu.org/licenses/gpl.html

fex/7z_C/7z.h

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

fex/7z_C/7zAlloc.c

@@ -1,74 +0,0 @@
-/* 7zAlloc.c -- Allocation functions
-2010-10-29 : Igor Pavlov : Public domain */
-
-#include "7zAlloc.h"
-
-/* #define _SZ_ALLOC_DEBUG */
-/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
-
-#ifdef _SZ_ALLOC_DEBUG
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <stdio.h>
-int g_allocCount = 0;
-int g_allocCountTemp = 0;
-
-#endif
-
-void* SzAlloc(void* p, size_t size)
-{
-    (void)p; // unused param
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
-    g_allocCount++;
-#endif
-    return malloc(size);
-}
-
-void SzFree(void* p, void* address)
-{
-    (void)p; // unused param
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0) {
-        g_allocCount--;
-        fprintf(stderr, "\nFree; count = %10d", g_allocCount);
-    }
-#endif
-    free(address);
-}
-
-void* SzAllocTemp(void* p, size_t size)
-{
-    (void)p; // unused param
-    if (size == 0)
-        return 0;
-#ifdef _SZ_ALLOC_DEBUG
-    fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);
-    g_allocCountTemp++;
-#ifdef _WIN32
-    return HeapAlloc(GetProcessHeap(), 0, size);
-#endif
-#endif
-    return malloc(size);
-}
-
-void SzFreeTemp(void* p, void* address)
-{
-    (void)p; // unused param
-#ifdef _SZ_ALLOC_DEBUG
-    if (address != 0) {
-        g_allocCountTemp--;
-        fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
-    }
-#ifdef _WIN32
-    HeapFree(GetProcessHeap(), 0, address);
-    return;
-#endif
-#endif
-    free(address);
-}

fex/7z_C/7zAlloc.h

@@ -1,15 +0,0 @@
-/* 7zAlloc.h -- Allocation functions
-2010-10-29 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_ALLOC_H
-#define __7Z_ALLOC_H
-
-#include <stdlib.h>
-
-void* SzAlloc(void* p, size_t size);
-void SzFree(void* p, void* address);
-
-void* SzAllocTemp(void* p, size_t size);
-void SzFreeTemp(void* p, void* address);
-
-#endif

fex/7z_C/7zBuf.c

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

fex/7z_C/7zBuf.h

@@ -1,39 +0,0 @@
-/* 7zBuf.h -- Byte Buffer
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_BUF_H
-#define __7Z_BUF_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-    Byte* data;
-    size_t size;
-} CBuf;
-
-void Buf_Init(CBuf* p);
-int Buf_Create(CBuf* p, size_t size, ISzAlloc* alloc);
-void Buf_Free(CBuf* p, ISzAlloc* alloc);
-
-typedef struct
-{
-    Byte* data;
-    size_t size;
-    size_t pos;
-} CDynBuf;
-
-void DynBuf_Construct(CDynBuf* p);
-void DynBuf_SeekToBeg(CDynBuf* p);
-int DynBuf_Write(CDynBuf* p, const Byte* buf, size_t size, ISzAlloc* alloc);
-void DynBuf_Free(CDynBuf* p, ISzAlloc* alloc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

fex/7z_C/7zCrc.c

@@ -1,80 +0,0 @@
-/* 7zCrc.c -- CRC32 init
-2010-12-01 : Igor Pavlov : Public domain */
-
-#include "7zCrc.h"
-#include "CpuArch.h"
-
-#define kCrcPoly 0xEDB88320
-
-#ifdef MY_CPU_X86_OR_AMD64
-#define CRC_NUM_TABLES 8
-UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void* data, size_t size, const UInt32* table);
-#elif defined(MY_CPU_LE)
-#define CRC_NUM_TABLES 4
-#else
-#define CRC_NUM_TABLES 5
-#define CRC_UINT32_SWAP(v) ((v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | (v << 24))
-UInt32 MY_FAST_CALL CrcUpdateT1_BeT4(UInt32 v, const void* data, size_t size, const UInt32* table);
-#endif
-
-#ifndef MY_CPU_BE
-UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void* data, size_t size, const UInt32* table);
-#endif
-
-typedef UInt32(MY_FAST_CALL* CRC_FUNC)(UInt32 v, const void* data, size_t size, const UInt32* table);
-
-static CRC_FUNC g_CrcUpdate;
-UInt32 g_CrcTable[256 * CRC_NUM_TABLES];
-
-UInt32 MY_FAST_CALL CrcUpdate(UInt32 v, const void* data, size_t size)
-{
-    return g_CrcUpdate(v, data, size, g_CrcTable);
-}
-
-UInt32 MY_FAST_CALL CrcCalc(const void* data, size_t size)
-{
-    return g_CrcUpdate(CRC_INIT_VAL, data, size, g_CrcTable) ^ CRC_INIT_VAL;
-}
-
-void MY_FAST_CALL CrcGenerateTable()
-{
-    UInt32 i;
-    for (i = 0; i < 256; i++) {
-        UInt32 r = i;
-        unsigned j;
-        for (j = 0; j < 8; j++)
-            r = (r >> 1) ^ (kCrcPoly & ~((r & 1) - 1));
-        g_CrcTable[i] = r;
-    }
-    for (; i < 256 * CRC_NUM_TABLES; i++) {
-        UInt32 r = g_CrcTable[i - 256];
-        g_CrcTable[i] = g_CrcTable[r & 0xFF] ^ (r >> 8);
-    }
-
-#ifdef MY_CPU_LE
-
-    g_CrcUpdate = CrcUpdateT4;
-
-#if CRC_NUM_TABLES == 8
-    if (!CPU_Is_InOrder())
-        g_CrcUpdate = CrcUpdateT8;
-#endif
-
-#else
-    {
-#ifndef MY_CPU_BE
-        UInt32 k = 1;
-        if (*(const Byte*)&k == 1)
-            g_CrcUpdate = CrcUpdateT4;
-        else
-#endif
-        {
-            for (i = 256 * CRC_NUM_TABLES - 1; i >= 256; i--) {
-                UInt32 x = g_CrcTable[i - 256];
-                g_CrcTable[i] = CRC_UINT32_SWAP(x);
-            }
-            g_CrcUpdate = CrcUpdateT1_BeT4;
-        }
-    }
-#endif
-}

fex/7z_C/7zCrc.h

@@ -1,25 +0,0 @@
-/* 7zCrc.h -- CRC32 calculation
-2009-11-21 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_CRC_H
-#define __7Z_CRC_H
-
-#include "Types.h"
-
-EXTERN_C_BEGIN
-
-extern UInt32 g_CrcTable[];
-
-/* Call CrcGenerateTable one time before other CRC functions */
-void MY_FAST_CALL CrcGenerateTable(void);
-
-#define CRC_INIT_VAL 0xFFFFFFFF
-#define CRC_GET_DIGEST(crc) ((crc) ^ CRC_INIT_VAL)
-#define CRC_UPDATE_BYTE(crc, b) (g_CrcTable[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
-
-UInt32 MY_FAST_CALL CrcUpdate(UInt32 crc, const void* data, size_t size);
-UInt32 MY_FAST_CALL CrcCalc(const void* data, size_t size);
-
-EXTERN_C_END
-
-#endif

fex/7z_C/7zCrcOpt.c

@@ -1,53 +0,0 @@
-/* 7zCrcOpt.c -- CRC32 calculation
-2010-12-01 : Igor Pavlov : Public domain */
-
-#include "CpuArch.h"
-
-#define CRC_UPDATE_BYTE_2(crc, b) (table[((crc) ^ (b)) & 0xFF] ^ ((crc) >> 8))
-
-#ifndef MY_CPU_BE
-
-UInt32 MY_FAST_CALL CrcUpdateT4(UInt32 v, const void* data, size_t size, const UInt32* table)
-{
-    const Byte* p = (const Byte*)data;
-    for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
-        v = CRC_UPDATE_BYTE_2(v, *p);
-    for (; size >= 4; size -= 4, p += 4) {
-        v ^= *(const UInt32*)p;
-        v = table[0x300 + (v & 0xFF)] ^ table[0x200 + ((v >> 8) & 0xFF)] ^ table[0x100 + ((v >> 16) & 0xFF)] ^ table[0x000 + ((v >> 24))];
-    }
-    for (; size > 0; size--, p++)
-        v = CRC_UPDATE_BYTE_2(v, *p);
-    return v;
-}
-
-UInt32 MY_FAST_CALL CrcUpdateT8(UInt32 v, const void* data, size_t size, const UInt32* table)
-{
-    return CrcUpdateT4(v, data, size, table);
-}
-
-#endif
-
-#ifndef MY_CPU_LE
-
-#define CRC_UINT32_SWAP(v) ((v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | (v << 24))
-
-UInt32 MY_FAST_CALL CrcUpdateT1_BeT4(UInt32 v, const void* data, size_t size, const UInt32* table)
-{
-    const Byte* p = (const Byte*)data;
-    for (; size > 0 && ((unsigned)(ptrdiff_t)p & 3) != 0; size--, p++)
-        v = CRC_UPDATE_BYTE_2(v, *p);
-    v = CRC_UINT32_SWAP(v);
-    table += 0x100;
-    for (; size >= 4; size -= 4, p += 4) {
-        v ^= *(const UInt32*)p;
-        v = table[0x000 + (v & 0xFF)] ^ table[0x100 + ((v >> 8) & 0xFF)] ^ table[0x200 + ((v >> 16) & 0xFF)] ^ table[0x300 + ((v >> 24))];
-    }
-    table -= 0x100;
-    v = CRC_UINT32_SWAP(v);
-    for (; size > 0; size--, p++)
-        v = CRC_UPDATE_BYTE_2(v, *p);
-    return v;
-}
-
-#endif

fex/7z_C/7zDec.c

@@ -1,413 +0,0 @@
-/* 7zDec.c -- Decoding from 7z folder
-2010-11-02 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-/* #define _7ZIP_PPMD_SUPPPORT */
-
-#include "7z.h"
-
-#include "Bcj2.h"
-#include "Bra.h"
-#include "CpuArch.h"
-#include "Lzma2Dec.h"
-#include "LzmaDec.h"
-#ifdef _7ZIP_PPMD_SUPPPORT
-#include "Ppmd7.h"
-#endif
-
-#define k_Copy 0
-#define k_LZMA2 0x21
-#define k_LZMA 0x30101
-#define k_BCJ 0x03030103
-#define k_PPC 0x03030205
-#define k_ARM 0x03030501
-#define k_ARMT 0x03030701
-#define k_SPARC 0x03030805
-#define k_BCJ2 0x0303011B
-
-#ifdef _7ZIP_PPMD_SUPPPORT
-
-#define k_PPMD 0x30401
-
-typedef struct
-{
-    IByteIn p;
-    const Byte* cur;
-    const Byte* end;
-    const Byte* begin;
-    UInt64 processed;
-    Bool extra;
-    SRes res;
-    ILookInStream* inStream;
-} CByteInToLook;
-
-static Byte ReadByte(void* pp)
-{
-    CByteInToLook* p = (CByteInToLook*)pp;
-    if (p->cur != p->end)
-        return *p->cur++;
-    if (p->res == SZ_OK) {
-        size_t size = p->cur - p->begin;
-        p->processed += size;
-        p->res = p->inStream->Skip(p->inStream, size);
-        size = (1 << 25);
-        p->res = p->inStream->Look(p->inStream, (const void**)&p->begin, &size);
-        p->cur = p->begin;
-        p->end = p->begin + size;
-        if (size != 0)
-            return *p->cur++;
-        ;
-    }
-    p->extra = True;
-    return 0;
-}
-
-static SRes SzDecodePpmd(CSzCoderInfo* coder, UInt64 inSize, ILookInStream* inStream,
-    Byte* outBuffer, SizeT outSize, ISzAlloc* allocMain)
-{
-    CPpmd7 ppmd;
-    CByteInToLook s;
-    SRes res = SZ_OK;
-
-    s.p.Read = ReadByte;
-    s.inStream = inStream;
-    s.begin = s.end = s.cur = NULL;
-    s.extra = False;
-    s.res = SZ_OK;
-    s.processed = 0;
-
-    if (coder->Props.size != 5)
-        return SZ_ERROR_UNSUPPORTED;
-
-    {
-        unsigned order = coder->Props.data[0];
-        UInt32 memSize = GetUi32(coder->Props.data + 1);
-        if (order < PPMD7_MIN_ORDER || order > PPMD7_MAX_ORDER || memSize < PPMD7_MIN_MEM_SIZE || memSize > PPMD7_MAX_MEM_SIZE)
-            return SZ_ERROR_UNSUPPORTED;
-        Ppmd7_Construct(&ppmd);
-        if (!Ppmd7_Alloc(&ppmd, memSize, allocMain))
-            return SZ_ERROR_MEM;
-        Ppmd7_Init(&ppmd, order);
-    }
-    {
-        CPpmd7z_RangeDec rc;
-        Ppmd7z_RangeDec_CreateVTable(&rc);
-        rc.Stream = &s.p;
-        if (!Ppmd7z_RangeDec_Init(&rc))
-            res = SZ_ERROR_DATA;
-        else if (s.extra)
-            res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
-        else {
-            SizeT i;
-            for (i = 0; i < outSize; i++) {
-                int sym = Ppmd7_DecodeSymbol(&ppmd, &rc.p);
-                if (s.extra || sym < 0)
-                    break;
-                outBuffer[i] = (Byte)sym;
-            }
-            if (i != outSize)
-                res = (s.res != SZ_OK ? s.res : SZ_ERROR_DATA);
-            else if (s.processed + (s.cur - s.begin) != inSize || !Ppmd7z_RangeDec_IsFinishedOK(&rc))
-                res = SZ_ERROR_DATA;
-        }
-    }
-    Ppmd7_Free(&ppmd, allocMain);
-    return res;
-}
-
-#endif
-
-static SRes SzDecodeLzma(CSzCoderInfo* coder, UInt64 inSize, ILookInStream* inStream,
-    Byte* outBuffer, SizeT outSize, ISzAlloc* allocMain)
-{
-    CLzmaDec state;
-    SRes res = SZ_OK;
-
-    LzmaDec_Construct(&state);
-    RINOK(LzmaDec_AllocateProbs(&state, coder->Props.data, (unsigned)coder->Props.size, allocMain));
-    state.dic = outBuffer;
-    state.dicBufSize = outSize;
-    LzmaDec_Init(&state);
-
-    for (;;) {
-        Byte* inBuf = NULL;
-        size_t lookahead = (1 << 18);
-        if (lookahead > inSize)
-            lookahead = (size_t)inSize;
-        res = inStream->Look((void*)inStream, (const void**)&inBuf, &lookahead);
-        if (res != SZ_OK)
-            break;
-
-        {
-            SizeT inProcessed = (SizeT)lookahead, dicPos = state.dicPos;
-            ELzmaStatus status;
-            res = LzmaDec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
-            lookahead -= inProcessed;
-            inSize -= inProcessed;
-            if (res != SZ_OK)
-                break;
-            if (state.dicPos == state.dicBufSize || (inProcessed == 0 && dicPos == state.dicPos)) {
-                if (state.dicBufSize != outSize || lookahead != 0 || (status != LZMA_STATUS_FINISHED_WITH_MARK && status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK))
-                    res = SZ_ERROR_DATA;
-                break;
-            }
-            res = inStream->Skip((void*)inStream, inProcessed);
-            if (res != SZ_OK)
-                break;
-        }
-    }
-
-    LzmaDec_FreeProbs(&state, allocMain);
-    return res;
-}
-
-static SRes SzDecodeLzma2(CSzCoderInfo* coder, UInt64 inSize, ILookInStream* inStream,
-    Byte* outBuffer, SizeT outSize, ISzAlloc* allocMain)
-{
-    CLzma2Dec state;
-    SRes res = SZ_OK;
-
-    Lzma2Dec_Construct(&state);
-    if (coder->Props.size != 1)
-        return SZ_ERROR_DATA;
-    RINOK(Lzma2Dec_AllocateProbs(&state, coder->Props.data[0], allocMain));
-    state.decoder.dic = outBuffer;
-    state.decoder.dicBufSize = outSize;
-    Lzma2Dec_Init(&state);
-
-    for (;;) {
-        Byte* inBuf = NULL;
-        size_t lookahead = (1 << 18);
-        if (lookahead > inSize)
-            lookahead = (size_t)inSize;
-        res = inStream->Look((void*)inStream, (const void**)&inBuf, &lookahead);
-        if (res != SZ_OK)
-            break;
-
-        {
-            SizeT inProcessed = (SizeT)lookahead, dicPos = state.decoder.dicPos;
-            ELzmaStatus status;
-            res = Lzma2Dec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
-            lookahead -= inProcessed;
-            inSize -= inProcessed;
-            if (res != SZ_OK)
-                break;
-            if (state.decoder.dicPos == state.decoder.dicBufSize || (inProcessed == 0 && dicPos == state.decoder.dicPos)) {
-                if (state.decoder.dicBufSize != outSize || lookahead != 0 || (status != LZMA_STATUS_FINISHED_WITH_MARK))
-                    res = SZ_ERROR_DATA;
-                break;
-            }
-            res = inStream->Skip((void*)inStream, inProcessed);
-            if (res != SZ_OK)
-                break;
-        }
-    }
-
-    Lzma2Dec_FreeProbs(&state, allocMain);
-    return res;
-}
-
-static SRes SzDecodeCopy(UInt64 inSize, ILookInStream* inStream, Byte* outBuffer)
-{
-    while (inSize > 0) {
-        void* inBuf;
-        size_t curSize = (1 << 18);
-        if (curSize > inSize)
-            curSize = (size_t)inSize;
-        RINOK(inStream->Look((void*)inStream, (const void**)&inBuf, &curSize));
-        if (curSize == 0)
-            return SZ_ERROR_INPUT_EOF;
-        memcpy(outBuffer, inBuf, curSize);
-        outBuffer += curSize;
-        inSize -= curSize;
-        RINOK(inStream->Skip((void*)inStream, curSize));
-    }
-    return SZ_OK;
-}
-
-static Bool IS_MAIN_METHOD(UInt32 m)
-{
-    switch (m) {
-    case k_Copy:
-    case k_LZMA:
-    case k_LZMA2:
-#ifdef _7ZIP_PPMD_SUPPPORT
-    case k_PPMD:
-#endif
-        return True;
-    }
-    return False;
-}
-
-static Bool IS_SUPPORTED_CODER(const CSzCoderInfo* c)
-{
-    return c->NumInStreams == 1 && c->NumOutStreams == 1 && c->MethodID <= (UInt32)0xFFFFFFFF && IS_MAIN_METHOD((UInt32)c->MethodID);
-}
-
-#define IS_BCJ2(c) ((c)->MethodID == k_BCJ2 && (c)->NumInStreams == 4 && (c)->NumOutStreams == 1)
-
-static SRes CheckSupportedFolder(const CSzFolder* f)
-{
-    if (f->NumCoders < 1 || f->NumCoders > 4)
-        return SZ_ERROR_UNSUPPORTED;
-    if (!IS_SUPPORTED_CODER(&f->Coders[0]))
-        return SZ_ERROR_UNSUPPORTED;
-    if (f->NumCoders == 1) {
-        if (f->NumPackStreams != 1 || f->PackStreams[0] != 0 || f->NumBindPairs != 0)
-            return SZ_ERROR_UNSUPPORTED;
-        return SZ_OK;
-    }
-    if (f->NumCoders == 2) {
-        CSzCoderInfo* c = &f->Coders[1];
-        if (c->MethodID > (UInt32)0xFFFFFFFF || c->NumInStreams != 1 || c->NumOutStreams != 1 || f->NumPackStreams != 1 || f->PackStreams[0] != 0 || f->NumBindPairs != 1 || f->BindPairs[0].InIndex != 1 || f->BindPairs[0].OutIndex != 0)
-            return SZ_ERROR_UNSUPPORTED;
-        switch ((UInt32)c->MethodID) {
-        case k_BCJ:
-        case k_ARM:
-            break;
-        default:
-            return SZ_ERROR_UNSUPPORTED;
-        }
-        return SZ_OK;
-    }
-    if (f->NumCoders == 4) {
-        if (!IS_SUPPORTED_CODER(&f->Coders[1]) || !IS_SUPPORTED_CODER(&f->Coders[2]) || !IS_BCJ2(&f->Coders[3]))
-            return SZ_ERROR_UNSUPPORTED;
-        if (f->NumPackStreams != 4 || f->PackStreams[0] != 2 || f->PackStreams[1] != 6 || f->PackStreams[2] != 1 || f->PackStreams[3] != 0 || f->NumBindPairs != 3 || f->BindPairs[0].InIndex != 5 || f->BindPairs[0].OutIndex != 0 || f->BindPairs[1].InIndex != 4 || f->BindPairs[1].OutIndex != 1 || f->BindPairs[2].InIndex != 3 || f->BindPairs[2].OutIndex != 2)
-            return SZ_ERROR_UNSUPPORTED;
-        return SZ_OK;
-    }
-    return SZ_ERROR_UNSUPPORTED;
-}
-
-static UInt64 GetSum(const UInt64* values, UInt32 index)
-{
-    UInt64 sum = 0;
-    UInt32 i;
-    for (i = 0; i < index; i++)
-        sum += values[i];
-    return sum;
-}
-
-#define CASE_BRA_CONV(isa)                       \
-    case k_##isa:                                \
-        isa##_Convert(outBuffer, outSize, 0, 0); \
-        break;
-
-static SRes SzFolder_Decode2(const CSzFolder* folder, const UInt64* packSizes,
-    ILookInStream* inStream, UInt64 startPos,
-    Byte* outBuffer, SizeT outSize, ISzAlloc* allocMain,
-    Byte* tempBuf[])
-{
-    UInt32 ci;
-    SizeT tempSizes[3] = { 0, 0, 0 };
-    SizeT tempSize3 = 0;
-    Byte* tempBuf3 = 0;
-
-    RINOK(CheckSupportedFolder(folder));
-
-    for (ci = 0; ci < folder->NumCoders; ci++) {
-        CSzCoderInfo* coder = &folder->Coders[ci];
-
-        if (IS_MAIN_METHOD((UInt32)coder->MethodID)) {
-            UInt32 si = 0;
-            UInt64 offset;
-            UInt64 inSize;
-            Byte* outBufCur = outBuffer;
-            SizeT outSizeCur = outSize;
-            if (folder->NumCoders == 4) {
-                UInt32 indices[] = { 3, 2, 0 };
-                UInt64 unpackSize = folder->UnpackSizes[ci];
-                si = indices[ci];
-                if (ci < 2) {
-                    Byte* temp;
-                    outSizeCur = (SizeT)unpackSize;
-                    if (outSizeCur != unpackSize)
-                        return SZ_ERROR_MEM;
-                    temp = (Byte*)IAlloc_Alloc(allocMain, outSizeCur);
-                    if (temp == 0 && outSizeCur != 0)
-                        return SZ_ERROR_MEM;
-                    outBufCur = tempBuf[1 - ci] = temp;
-                    tempSizes[1 - ci] = outSizeCur;
-                } else if (ci == 2) {
-                    if (unpackSize > outSize) /* check it */
-                        return SZ_ERROR_PARAM;
-                    tempBuf3 = outBufCur = outBuffer + (outSize - (size_t)unpackSize);
-                    tempSize3 = outSizeCur = (SizeT)unpackSize;
-                } else
-                    return SZ_ERROR_UNSUPPORTED;
-            }
-            offset = GetSum(packSizes, si);
-            inSize = packSizes[si];
-            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
-
-            if (coder->MethodID == k_Copy) {
-                if (inSize != outSizeCur) /* check it */
-                    return SZ_ERROR_DATA;
-                RINOK(SzDecodeCopy(inSize, inStream, outBufCur));
-            } else if (coder->MethodID == k_LZMA) {
-                RINOK(SzDecodeLzma(coder, inSize, inStream, outBufCur, outSizeCur, allocMain));
-            } else if (coder->MethodID == k_LZMA2) {
-                RINOK(SzDecodeLzma2(coder, inSize, inStream, outBufCur, outSizeCur, allocMain));
-            } else {
-#ifdef _7ZIP_PPMD_SUPPPORT
-                RINOK(SzDecodePpmd(coder, inSize, inStream, outBufCur, outSizeCur, allocMain));
-#else
-                return SZ_ERROR_UNSUPPORTED;
-#endif
-            }
-        } else if (coder->MethodID == k_BCJ2) {
-            UInt64 offset = GetSum(packSizes, 1);
-            UInt64 s3Size = packSizes[1];
-            SRes res;
-            if (ci != 3)
-                return SZ_ERROR_UNSUPPORTED;
-            RINOK(LookInStream_SeekTo(inStream, startPos + offset));
-            tempSizes[2] = (SizeT)s3Size;
-            if (tempSizes[2] != s3Size)
-                return SZ_ERROR_MEM;
-            tempBuf[2] = (Byte*)IAlloc_Alloc(allocMain, tempSizes[2]);
-            if (tempBuf[2] == 0 && tempSizes[2] != 0)
-                return SZ_ERROR_MEM;
-            res = SzDecodeCopy(s3Size, inStream, tempBuf[2]);
-            RINOK(res)
-
-            res = Bcj2_Decode(
-                tempBuf3, tempSize3,
-                tempBuf[0], tempSizes[0],
-                tempBuf[1], tempSizes[1],
-                tempBuf[2], tempSizes[2],
-                outBuffer, outSize);
-            RINOK(res)
-        } else {
-            if (ci != 1)
-                return SZ_ERROR_UNSUPPORTED;
-            switch (coder->MethodID) {
-            case k_BCJ: {
-                UInt32 state;
-                x86_Convert_Init(state);
-                x86_Convert(outBuffer, outSize, 0, &state, 0);
-                break;
-            }
-                CASE_BRA_CONV(ARM)
-            default:
-                return SZ_ERROR_UNSUPPORTED;
-            }
-        }
-    }
-    return SZ_OK;
-}
-
-SRes SzFolder_Decode(const CSzFolder* folder, const UInt64* packSizes,
-    ILookInStream* inStream, UInt64 startPos,
-    Byte* outBuffer, size_t outSize, ISzAlloc* allocMain)
-{
-    Byte* tempBuf[3] = { 0, 0, 0 };
-    int i;
-    SRes res = SzFolder_Decode2(folder, packSizes, inStream, startPos,
-        outBuffer, (SizeT)outSize, allocMain, tempBuf);
-    for (i = 0; i < 3; i++)
-        IAlloc_Free(allocMain, tempBuf[i]);
-    return res;
-}

fex/7z_C/7zStream.c

@@ -1,163 +0,0 @@
-/* 7zStream.c -- 7z Stream functions
-2010-03-11 : Igor Pavlov : Public domain */
-
-#include <string.h>
-
-#include "Types.h"
-
-SRes SeqInStream_Read2(ISeqInStream* stream, void* buf, size_t size, SRes errorType)
-{
-    while (size != 0) {
-        size_t processed = size;
-        RINOK(stream->Read(stream, buf, &processed));
-        if (processed == 0)
-            return errorType;
-        buf = (void*)((Byte*)buf + processed);
-        size -= processed;
-    }
-    return SZ_OK;
-}
-
-SRes SeqInStream_Read(ISeqInStream* stream, void* buf, size_t size)
-{
-    return SeqInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
-}
-
-SRes SeqInStream_ReadByte(ISeqInStream* stream, Byte* buf)
-{
-    size_t processed = 1;
-    RINOK(stream->Read(stream, buf, &processed));
-    return (processed == 1) ? SZ_OK : SZ_ERROR_INPUT_EOF;
-}
-
-SRes LookInStream_SeekTo(ILookInStream* stream, UInt64 offset)
-{
-    Int64 t = offset;
-    return stream->Seek(stream, &t, SZ_SEEK_SET);
-}
-
-SRes LookInStream_LookRead(ILookInStream* stream, void* buf, size_t* size)
-{
-    const void* lookBuf;
-    if (*size == 0)
-        return SZ_OK;
-    RINOK(stream->Look(stream, &lookBuf, size));
-    memcpy(buf, lookBuf, *size);
-    return stream->Skip(stream, *size);
-}
-
-SRes LookInStream_Read2(ILookInStream* stream, void* buf, size_t size, SRes errorType)
-{
-    while (size != 0) {
-        size_t processed = size;
-        RINOK(stream->Read(stream, buf, &processed));
-        if (processed == 0)
-            return errorType;
-        buf = (void*)((Byte*)buf + processed);
-        size -= processed;
-    }
-    return SZ_OK;
-}
-
-SRes LookInStream_Read(ILookInStream* stream, void* buf, size_t size)
-{
-    return LookInStream_Read2(stream, buf, size, SZ_ERROR_INPUT_EOF);
-}
-
-static SRes LookToRead_Look_Lookahead(void* pp, const void** buf, size_t* size)
-{
-    SRes res = SZ_OK;
-    CLookToRead* p = (CLookToRead*)pp;
-    size_t size2 = p->size - p->pos;
-    if (size2 == 0 && *size > 0) {
-        p->pos = 0;
-        size2 = LookToRead_BUF_SIZE;
-        res = p->realStream->Read(p->realStream, p->buf, &size2);
-        p->size = size2;
-    }
-    if (size2 < *size)
-        *size = size2;
-    *buf = p->buf + p->pos;
-    return res;
-}
-
-static SRes LookToRead_Look_Exact(void* pp, const void** buf, size_t* size)
-{
-    SRes res = SZ_OK;
-    CLookToRead* p = (CLookToRead*)pp;
-    size_t size2 = p->size - p->pos;
-    if (size2 == 0 && *size > 0) {
-        p->pos = 0;
-        if (*size > LookToRead_BUF_SIZE)
-            *size = LookToRead_BUF_SIZE;
-        res = p->realStream->Read(p->realStream, p->buf, size);
-        size2 = p->size = *size;
-    }
-    if (size2 < *size)
-        *size = size2;
-    *buf = p->buf + p->pos;
-    return res;
-}
-
-static SRes LookToRead_Skip(void* pp, size_t offset)
-{
-    CLookToRead* p = (CLookToRead*)pp;
-    p->pos += offset;
-    return SZ_OK;
-}
-
-static SRes LookToRead_Read(void* pp, void* buf, size_t* size)
-{
-    CLookToRead* p = (CLookToRead*)pp;
-    size_t rem = p->size - p->pos;
-    if (rem == 0)
-        return p->realStream->Read(p->realStream, buf, size);
-    if (rem > *size)
-        rem = *size;
-    memcpy(buf, p->buf + p->pos, rem);
-    p->pos += rem;
-    *size = rem;
-    return SZ_OK;
-}
-
-static SRes LookToRead_Seek(void* pp, Int64* pos, ESzSeek origin)
-{
-    CLookToRead* p = (CLookToRead*)pp;
-    p->pos = p->size = 0;
-    return p->realStream->Seek(p->realStream, pos, origin);
-}
-
-void LookToRead_CreateVTable(CLookToRead* p, int lookahead)
-{
-    p->s.Look = lookahead ? LookToRead_Look_Lookahead : LookToRead_Look_Exact;
-    p->s.Skip = LookToRead_Skip;
-    p->s.Read = LookToRead_Read;
-    p->s.Seek = LookToRead_Seek;
-}
-
-void LookToRead_Init(CLookToRead* p)
-{
-    p->pos = p->size = 0;
-}
-
-static SRes SecToLook_Read(void* pp, void* buf, size_t* size)
-{
-    CSecToLook* p = (CSecToLook*)pp;
-    return LookInStream_LookRead(p->realStream, buf, size);
-}
-
-void SecToLook_CreateVTable(CSecToLook* p)
-{
-    p->s.Read = SecToLook_Read;
-}
-
-static SRes SecToRead_Read(void* pp, void* buf, size_t* size)
-{
-    CSecToRead* p = (CSecToRead*)pp;
-    return p->realStream->Read(p->realStream, buf, size);
-}
-
-void SecToRead_CreateVTable(CSecToRead* p)
-{
-    p->s.Read = SecToRead_Read;
-}

fex/7z_C/Bcj2.c

@@ -1,153 +0,0 @@
-/* Bcj2.c -- Converter for x86 code (BCJ2)
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bcj2.h"
-
-#ifdef _LZMA_PROB32
-#define CProb UInt32
-#else
-#define CProb UInt16
-#endif
-
-#define IsJcc(b0, b1) ((b0) == 0x0F && ((b1)&0xF0) == 0x80)
-#define IsJ(b0, b1) ((b1 & 0xFE) == 0xE8 || IsJcc(b0, b1))
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-
-#define RC_READ_BYTE (*buffer++)
-#define RC_TEST                   \
-    {                             \
-        if (buffer == bufferLim)  \
-            return SZ_ERROR_DATA; \
-    }
-#define RC_INIT2                               \
-    code = 0;                                  \
-    range = 0xFFFFFFFF;                        \
-    {                                          \
-        int i;                                 \
-        for (i = 0; i < 5; i++) {              \
-            RC_TEST;                           \
-            code = (code << 8) | RC_READ_BYTE; \
-        }                                      \
-    }
-
-#define NORMALIZE                          \
-    if (range < kTopValue) {               \
-        RC_TEST;                           \
-        range <<= 8;                       \
-        code = (code << 8) | RC_READ_BYTE; \
-    }
-
-#define IF_BIT_0(p)                                 \
-    ttt = *(p);                                     \
-    bound = (range >> kNumBitModelTotalBits) * ttt; \
-    if (code < bound)
-#define UPDATE_0(p)                                                 \
-    range = bound;                                                  \
-    *(p) = (CProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits)); \
-    NORMALIZE;
-#define UPDATE_1(p)                              \
-    range -= bound;                              \
-    code -= bound;                               \
-    *(p) = (CProb)(ttt - (ttt >> kNumMoveBits)); \
-    NORMALIZE;
-
-int Bcj2_Decode(
-    const Byte* buf0, SizeT size0,
-    const Byte* buf1, SizeT size1,
-    const Byte* buf2, SizeT size2,
-    const Byte* buf3, SizeT size3,
-    Byte* outBuf, SizeT outSize)
-{
-    CProb p[256 + 2];
-    SizeT inPos = 0, outPos = 0;
-
-    const Byte *buffer, *bufferLim;
-    UInt32 range, code;
-    Byte prevByte = 0;
-
-    unsigned int i;
-    for (i = 0; i < sizeof(p) / sizeof(p[0]); i++)
-        p[i] = kBitModelTotal >> 1;
-
-    buffer = buf3;
-    bufferLim = buffer + size3;
-    RC_INIT2
-
-    if (outSize == 0)
-        return SZ_OK;
-
-    for (;;) {
-        Byte b;
-        CProb* prob;
-        UInt32 bound;
-        UInt32 ttt;
-
-        SizeT limit = size0 - inPos;
-        if (outSize - outPos < limit)
-            limit = outSize - outPos;
-        while (limit != 0) {
-            Byte b = buf0[inPos];
-            outBuf[outPos++] = b;
-            if (IsJ(prevByte, b))
-                break;
-            inPos++;
-            prevByte = b;
-            limit--;
-        }
-
-        if (limit == 0 || outPos == outSize)
-            break;
-
-        b = buf0[inPos++];
-
-        if (b == 0xE8)
-            prob = p + prevByte;
-        else if (b == 0xE9)
-            prob = p + 256;
-        else
-            prob = p + 257;
-
-        IF_BIT_0(prob)
-        {
-            UPDATE_0(prob)
-            prevByte = b;
-        }
-        else
-        {
-            UInt32 dest;
-            const Byte* v;
-            UPDATE_1(prob)
-            if (b == 0xE8) {
-                v = buf1;
-                if (size1 < 4)
-                    return SZ_ERROR_DATA;
-                buf1 += 4;
-                size1 -= 4;
-            } else {
-                v = buf2;
-                if (size2 < 4)
-                    return SZ_ERROR_DATA;
-                buf2 += 4;
-                size2 -= 4;
-            }
-            dest = (((UInt32)v[0] << 24) | ((UInt32)v[1] << 16) | ((UInt32)v[2] << 8) | ((UInt32)v[3])) - ((UInt32)outPos + 4);
-            outBuf[outPos++] = (Byte)dest;
-            if (outPos == outSize)
-                break;
-            outBuf[outPos++] = (Byte)(dest >> 8);
-            if (outPos == outSize)
-                break;
-            outBuf[outPos++] = (Byte)(dest >> 16);
-            if (outPos == outSize)
-                break;
-            outBuf[outPos++] = prevByte = (Byte)(dest >> 24);
-        }
-    }
-    return (outPos == outSize) ? SZ_OK : SZ_ERROR_DATA;
-}

fex/7z_C/Bcj2.h

@@ -1,38 +0,0 @@
-/* Bcj2.h -- Converter for x86 code (BCJ2)
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __BCJ2_H
-#define __BCJ2_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-Conditions:
-  outSize <= FullOutputSize,
-  where FullOutputSize is full size of output stream of x86_2 filter.
-
-If buf0 overlaps outBuf, there are two required conditions:
-  1) (buf0 >= outBuf)
-  2) (buf0 + size0 >= outBuf + FullOutputSize).
-
-Returns:
-  SZ_OK
-  SZ_ERROR_DATA - Data error
-*/
-
-int Bcj2_Decode(
-    const Byte* buf0, SizeT size0,
-    const Byte* buf1, SizeT size1,
-    const Byte* buf2, SizeT size2,
-    const Byte* buf3, SizeT size3,
-    Byte* outBuf, SizeT outSize);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

fex/7z_C/Bra.c

@@ -1,112 +0,0 @@
-/* Bra.c -- Converters for RISC code
-2010-04-16 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-SizeT ARM_Convert(Byte* data, SizeT size, UInt32 ip, int encoding)
-{
-    SizeT i;
-    if (size < 4)
-        return 0;
-    size -= 4;
-    ip += 8;
-    for (i = 0; i <= size; i += 4) {
-        if (data[i + 3] == 0xEB) {
-            UInt32 dest;
-            UInt32 src = ((UInt32)data[i + 2] << 16) | ((UInt32)data[i + 1] << 8) | (data[i + 0]);
-            src <<= 2;
-            if (encoding)
-                dest = ip + (UInt32)i + src;
-            else
-                dest = src - (ip + (UInt32)i);
-            dest >>= 2;
-            data[i + 2] = (Byte)(dest >> 16);
-            data[i + 1] = (Byte)(dest >> 8);
-            data[i + 0] = (Byte)dest;
-        }
-    }
-    return i;
-}
-
-SizeT ARMT_Convert(Byte* data, SizeT size, UInt32 ip, int encoding)
-{
-    SizeT i;
-    if (size < 4)
-        return 0;
-    size -= 4;
-    ip += 4;
-    for (i = 0; i <= size; i += 2) {
-        if ((data[i + 1] & 0xF8) == 0xF0 && (data[i + 3] & 0xF8) == 0xF8) {
-            UInt32 dest;
-            UInt32 src = (((UInt32)data[i + 1] & 0x7) << 19) | ((UInt32)data[i + 0] << 11) | (((UInt32)data[i + 3] & 0x7) << 8) | (data[i + 2]);
-
-            src <<= 1;
-            if (encoding)
-                dest = ip + (UInt32)i + src;
-            else
-                dest = src - (ip + (UInt32)i);
-            dest >>= 1;
-
-            data[i + 1] = (Byte)(0xF0 | ((dest >> 19) & 0x7));
-            data[i + 0] = (Byte)(dest >> 11);
-            data[i + 3] = (Byte)(0xF8 | ((dest >> 8) & 0x7));
-            data[i + 2] = (Byte)dest;
-            i += 2;
-        }
-    }
-    return i;
-}
-
-SizeT PPC_Convert(Byte* data, SizeT size, UInt32 ip, int encoding)
-{
-    SizeT i;
-    if (size < 4)
-        return 0;
-    size -= 4;
-    for (i = 0; i <= size; i += 4) {
-        if ((data[i] >> 2) == 0x12 && (data[i + 3] & 3) == 1) {
-            UInt32 src = ((UInt32)(data[i + 0] & 3) << 24) | ((UInt32)data[i + 1] << 16) | ((UInt32)data[i + 2] << 8) | ((UInt32)data[i + 3] & (~3));
-
-            UInt32 dest;
-            if (encoding)
-                dest = ip + (UInt32)i + src;
-            else
-                dest = src - (ip + (UInt32)i);
-            data[i + 0] = (Byte)(0x48 | ((dest >> 24) & 0x3));
-            data[i + 1] = (Byte)(dest >> 16);
-            data[i + 2] = (Byte)(dest >> 8);
-            data[i + 3] &= 0x3;
-            data[i + 3] |= dest;
-        }
-    }
-    return i;
-}
-
-SizeT SPARC_Convert(Byte* data, SizeT size, UInt32 ip, int encoding)
-{
-    UInt32 i;
-    if (size < 4)
-        return 0;
-    size -= 4;
-    for (i = 0; i <= size; i += 4) {
-        if ((data[i] == 0x40 && (data[i + 1] & 0xC0) == 0x00) || (data[i] == 0x7F && (data[i + 1] & 0xC0) == 0xC0)) {
-            UInt32 src = ((UInt32)data[i + 0] << 24) | ((UInt32)data[i + 1] << 16) | ((UInt32)data[i + 2] << 8) | ((UInt32)data[i + 3]);
-            UInt32 dest;
-
-            src <<= 2;
-            if (encoding)
-                dest = ip + i + src;
-            else
-                dest = src - (ip + i);
-            dest >>= 2;
-
-            dest = (((0 - ((dest >> 22) & 1)) << 22) & 0x3FFFFFFF) | (dest & 0x3FFFFF) | 0x40000000;
-
-            data[i + 0] = (Byte)(dest >> 24);
-            data[i + 1] = (Byte)(dest >> 16);
-            data[i + 2] = (Byte)(dest >> 8);
-            data[i + 3] = (Byte)dest;
-        }
-    }
-    return i;
-}

fex/7z_C/Bra.h

@@ -1,71 +0,0 @@
-/* Bra.h -- Branch converters for executables
-2009-02-07 : Igor Pavlov : Public domain */
-
-#ifndef __BRA_H
-#define __BRA_H
-
-#include "Types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-These functions convert relative addresses to absolute addresses
-in CALL instructions to increase the compression ratio.
-  
-  In:
-    data     - data buffer
-    size     - size of data
-    ip       - current virtual Instruction Pinter (IP) value
-    state    - state variable for x86 converter
-    encoding - 0 (for decoding), 1 (for encoding)
-  
-  Out:
-    state    - state variable for x86 converter
-
-  Returns:
-    The number of processed bytes. If you call these functions with multiple calls,
-    you must start next call with first byte after block of processed bytes.
-  
-  Type   Endian  Alignment  LookAhead
-  
-  x86    little      1          4
-  ARMT   little      2          2
-  ARM    little      4          0
-  PPC     big        4          0
-  SPARC   big        4          0
-  IA64   little     16          0
-
-  size must be >= Alignment + LookAhead, if it's not last block.
-  If (size < Alignment + LookAhead), converter returns 0.
-
-  Example:
-
-    UInt32 ip = 0;
-    for ()
-    {
-      ; size must be >= Alignment + LookAhead, if it's not last block
-      SizeT processed = Convert(data, size, ip, 1);
-      data += processed;
-      size -= processed;
-      ip += processed;
-    }
-*/
-
-#define x86_Convert_Init(state) \
-    {                           \
-        state = 0;              \
-    }
-SizeT x86_Convert(Byte* data, SizeT size, UInt32 ip, UInt32* state, int encoding);
-SizeT ARM_Convert(Byte* data, SizeT size, UInt32 ip, int encoding);
-SizeT ARMT_Convert(Byte* data, SizeT size, UInt32 ip, int encoding);
-SizeT PPC_Convert(Byte* data, SizeT size, UInt32 ip, int encoding);
-SizeT SPARC_Convert(Byte* data, SizeT size, UInt32 ip, int encoding);
-SizeT IA64_Convert(Byte* data, SizeT size, UInt32 ip, int encoding);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

fex/7z_C/Bra86.c

@@ -1,77 +0,0 @@
-/* Bra86.c -- Converter for x86 code (BCJ)
-2008-10-04 : Igor Pavlov : Public domain */
-
-#include "Bra.h"
-
-#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
-
-const Byte kMaskToAllowedStatus[8] = { 1, 1, 1, 0, 1, 0, 0, 0 };
-const Byte kMaskToBitNumber[8] = { 0, 1, 2, 2, 3, 3, 3, 3 };
-
-SizeT x86_Convert(Byte* data, SizeT size, UInt32 ip, UInt32* state, int encoding)
-{
-    SizeT bufferPos = 0, prevPosT;
-    UInt32 prevMask = *state & 0x7;
-    if (size < 5)
-        return 0;
-    ip += 5;
-    prevPosT = (SizeT)0 - 1;
-
-    for (;;) {
-        Byte* p = data + bufferPos;
-        Byte* limit = data + size - 4;
-        for (; p < limit; p++)
-            if ((*p & 0xFE) == 0xE8)
-                break;
-        bufferPos = (SizeT)(p - data);
-        if (p >= limit)
-            break;
-        prevPosT = bufferPos - prevPosT;
-        if (prevPosT > 3)
-            prevMask = 0;
-        else {
-            prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;
-            if (prevMask != 0) {
-                Byte b = p[4 - kMaskToBitNumber[prevMask]];
-                if (!kMaskToAllowedStatus[prevMask] || Test86MSByte(b)) {
-                    prevPosT = bufferPos;
-                    prevMask = ((prevMask << 1) & 0x7) | 1;
-                    bufferPos++;
-                    continue;
-                }
-            }
-        }
-        prevPosT = bufferPos;
-
-        if (Test86MSByte(p[4])) {
-            UInt32 src = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
-            UInt32 dest;
-            for (;;) {
-                Byte b;
-                int index;
-                if (encoding)
-                    dest = (ip + (UInt32)bufferPos) + src;
-                else
-                    dest = src - (ip + (UInt32)bufferPos);
-                if (prevMask == 0)
-                    break;
-                index = kMaskToBitNumber[prevMask] * 8;
-                b = (Byte)(dest >> (24 - index));
-                if (!Test86MSByte(b))
-                    break;
-                src = dest ^ ((1 << (32 - index)) - 1);
-            }
-            p[4] = (Byte)(~(((dest >> 24) & 1) - 1));
-            p[3] = (Byte)(dest >> 16);
-            p[2] = (Byte)(dest >> 8);
-            p[1] = (Byte)dest;
-            bufferPos += 5;
-        } else {
-            prevMask = ((prevMask << 1) & 0x7) | 1;
-            bufferPos++;
-        }
-    }
-    prevPosT = bufferPos - prevPosT;
-    *state = ((prevPosT > 3) ? 0 : ((prevMask << ((int)prevPosT - 1)) & 0x7));
-    return bufferPos;
-}

fex/7z_C/CpuArch.c

@@ -1,171 +0,0 @@
-/* CpuArch.c -- CPU specific code
-2010-10-26: Igor Pavlov : Public domain */
-
-#include "CpuArch.h"
-
-#ifdef MY_CPU_X86_OR_AMD64
-
-#if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__) || defined(__clang__)
-#define USE_ASM
-#endif
-
-#if defined(USE_ASM) && !defined(MY_CPU_AMD64)
-static UInt32 CheckFlag(UInt32 flag)
-{
-#ifdef _MSC_VER
-    __asm pushfd;
-    __asm pop EAX;
-    __asm mov EDX, EAX;
-    __asm xor EAX, flag;
-    __asm push EAX;
-    __asm popfd;
-    __asm pushfd;
-    __asm pop EAX;
-    __asm xor EAX, EDX;
-    __asm push EDX;
-    __asm popfd;
-    __asm and flag, EAX;
-#else
-    __asm__ __volatile__(
-        "pushf\n\t"
-        "pop  %%EAX\n\t"
-        "movl %%EAX,%%EDX\n\t"
-        "xorl %0,%%EAX\n\t"
-        "push %%EAX\n\t"
-        "popf\n\t"
-        "pushf\n\t"
-        "pop  %%EAX\n\t"
-        "xorl %%EDX,%%EAX\n\t"
-        "push %%EDX\n\t"
-        "popf\n\t"
-        "andl %%EAX, %0\n\t"
-        : "=c"(flag)
-        : "c"(flag));
-#endif
-    return flag;
-}
-#define CHECK_CPUID_IS_SUPPORTED                            \
-    if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) \
-        return False;
-#else
-#define CHECK_CPUID_IS_SUPPORTED
-#endif
-
-static void MyCPUID(UInt32 function, UInt32* a, UInt32* b, UInt32* c, UInt32* d)
-{
-#ifdef USE_ASM
-
-#ifdef _MSC_VER
-
-    UInt32 a2, b2, c2, d2;
-    __asm xor EBX, EBX;
-    __asm xor ECX, ECX;
-    __asm xor EDX, EDX;
-    __asm mov EAX, function;
-    __asm cpuid;
-    __asm mov a2, EAX;
-    __asm mov b2, EBX;
-    __asm mov c2, ECX;
-    __asm mov d2, EDX;
-
-    *a = a2;
-    *b = b2;
-    *c = c2;
-    *d = d2;
-
-#else
-
-    __asm__ __volatile__(
-        "cpuid"
-        : "=a"(*a),
-        "=b"(*b),
-        "=c"(*c),
-        "=d"(*d)
-        : "0"(function));
-
-#endif
-
-#else
-
-    int CPUInfo[4];
-    __cpuid(CPUInfo, function);
-    *a = CPUInfo[0];
-    *b = CPUInfo[1];
-    *c = CPUInfo[2];
-    *d = CPUInfo[3];
-
-#endif
-}
-
-Bool x86cpuid_CheckAndRead(Cx86cpuid* p)
-{
-    CHECK_CPUID_IS_SUPPORTED
-    MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
-    MyCPUID(1, &p->ver, &p->b, &p->c, &p->d);
-    return True;
-}
-
-static UInt32 kVendors[][3] = {
-    { 0x756E6547, 0x49656E69, 0x6C65746E },
-    { 0x68747541, 0x69746E65, 0x444D4163 },
-    { 0x746E6543, 0x48727561, 0x736C7561 }
-};
-
-int x86cpuid_GetFirm(const Cx86cpuid* p)
-{
-    unsigned i;
-    for (i = 0; i < sizeof(kVendors) / sizeof(kVendors[i]); i++) {
-        const UInt32* v = kVendors[i];
-        if (v[0] == p->vendor[0] && v[1] == p->vendor[1] && v[2] == p->vendor[2])
-            return (int)i;
-    }
-    return -1;
-}
-
-Bool CPU_Is_InOrder()
-{
-    Cx86cpuid p;
-    int firm;
-    UInt32 family, model;
-    if (!x86cpuid_CheckAndRead(&p))
-        return True;
-    family = x86cpuid_GetFamily(&p);
-    model = x86cpuid_GetModel(&p);
-    firm = x86cpuid_GetFirm(&p);
-    switch (firm) {
-    case CPU_FIRM_INTEL:
-        return (family < 6 || (family == 6 && model == 0x100C));
-    case CPU_FIRM_AMD:
-        return (family < 5 || (family == 5 && (model < 6 || model == 0xA)));
-    case CPU_FIRM_VIA:
-        return (family < 6 || (family == 6 && model < 0xF));
-    }
-    return True;
-}
-
-#if !defined(MY_CPU_AMD64) && defined(_WIN32)
-static Bool CPU_Sys_Is_SSE_Supported()
-{
-    OSVERSIONINFO vi;
-    vi.dwOSVersionInfoSize = sizeof(vi);
-    if (!GetVersionEx(&vi))
-        return False;
-    return (vi.dwMajorVersion >= 5);
-}
-#define CHECK_SYS_SSE_SUPPORT        \
-    if (!CPU_Sys_Is_SSE_Supported()) \
-        return False;
-#else
-#define CHECK_SYS_SSE_SUPPORT
-#endif
-
-Bool CPU_Is_Aes_Supported()
-{
-    Cx86cpuid p;
-    CHECK_SYS_SSE_SUPPORT
-    if (!x86cpuid_CheckAndRead(&p))
-        return False;
-    return (p.c >> 25) & 1;
-}
-
-#endif

fex/7z_C/CpuArch.h

@@ -1,156 +0,0 @@
-/* CpuArch.h -- CPU specific code
-2010-12-01: Igor Pavlov : Public domain */
-
-#ifndef __CPU_ARCH_H
-#define __CPU_ARCH_H
-
-#include "Types.h"
-
-EXTERN_C_BEGIN
-
-/*
-MY_CPU_LE means that CPU is LITTLE ENDIAN.
-If MY_CPU_LE is not defined, we don't know about that property of platform (it can be LITTLE ENDIAN).
-
-MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned memory accesses.
-If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
-*/
-
-#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
-#define MY_CPU_AMD64
-#endif
-
-#if defined(MY_CPU_AMD64) || defined(_M_IA64)
-#define MY_CPU_64BIT
-#endif
-
-#if defined(_M_IX86) || defined(__i386__)
-#define MY_CPU_X86
-#endif
-
-#if defined(MY_CPU_X86) || defined(MY_CPU_AMD64)
-#define MY_CPU_X86_OR_AMD64
-#endif
-
-#if defined(MY_CPU_X86) || defined(_M_ARM)
-#define MY_CPU_32BIT
-#endif
-
-#if defined(_WIN32) && defined(_M_ARM)
-#define MY_CPU_ARM_LE
-#endif
-
-#if defined(_WIN32) && defined(_M_IA64)
-#define MY_CPU_IA64_LE
-#endif
-
-#if defined(MY_CPU_X86_OR_AMD64)
-#define MY_CPU_LE_UNALIGN
-#endif
-
-#if defined(MY_CPU_X86_OR_AMD64) || defined(MY_CPU_ARM_LE) || defined(MY_CPU_IA64_LE) || defined(__ARMEL__) || defined(__MIPSEL__) || defined(__LITTLE_ENDIAN__)
-#define MY_CPU_LE
-#endif
-
-#if defined(__BIG_ENDIAN__) || defined(__m68k__) || defined(__ARMEB__) || defined(__MIPSEB__)
-#define MY_CPU_BE
-#endif
-
-#if defined(MY_CPU_LE) && defined(MY_CPU_BE)
-Stop_Compiling_Bad_Endian
-#endif
-
-#ifdef MY_CPU_LE_UNALIGN
-
-#define GetUi16(p) (*(const UInt16*)(p))
-#define GetUi32(p) (*(const UInt32*)(p))
-#define GetUi64(p) (*(const UInt64*)(p))
-#define SetUi16(p, d) *(UInt16*)(p) = (d);
-#define SetUi32(p, d) *(UInt32*)(p) = (d);
-#define SetUi64(p, d) *(UInt64*)(p) = (d);
-
-#else
-
-#define GetUi16(p) (((const Byte*)(p))[0] | ((UInt16)((const Byte*)(p))[1] << 8))
-
-#define GetUi32(p) ( \
-    ((const Byte*)(p))[0] | ((UInt32)((const Byte*)(p))[1] << 8) | ((UInt32)((const Byte*)(p))[2] << 16) | ((UInt32)((const Byte*)(p))[3] << 24))
-
-#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte*)(p)) + 4) << 32))
-
-#define SetUi16(p, d)                       \
-    {                                       \
-        UInt32 _x_ = (d);                   \
-        ((Byte*)(p))[0] = (Byte)_x_;        \
-        ((Byte*)(p))[1] = (Byte)(_x_ >> 8); \
-    }
-
-#define SetUi32(p, d)                        \
-    {                                        \
-        UInt32 _x_ = (d);                    \
-        ((Byte*)(p))[0] = (Byte)_x_;         \
-        ((Byte*)(p))[1] = (Byte)(_x_ >> 8);  \
-        ((Byte*)(p))[2] = (Byte)(_x_ >> 16); \
-        ((Byte*)(p))[3] = (Byte)(_x_ >> 24); \
-    }
-
-#define SetUi64(p, d)                                     \
-    {                                                     \
-        UInt64 _x64_ = (d);                               \
-        SetUi32(p, (UInt32)_x64_);                        \
-        SetUi32(((Byte*)(p)) + 4, (UInt32)(_x64_ >> 32)); \
-    }
-
-#endif
-
-#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
-
-#pragma intrinsic(_byteswap_ulong)
-#pragma intrinsic(_byteswap_uint64)
-#define GetBe32(p) _byteswap_ulong(*(const UInt32*)(const Byte*)(p))
-#define GetBe64(p) _byteswap_uint64(*(const UInt64*)(const Byte*)(p))
-
-#else
-
-#define GetBe32(p) ( \
-    ((UInt32)((const Byte*)(p))[0] << 24) | ((UInt32)((const Byte*)(p))[1] << 16) | ((UInt32)((const Byte*)(p))[2] << 8) | ((const Byte*)(p))[3])
-
-#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte*)(p)) + 4))
-
-#endif
-
-#define GetBe16(p) (((UInt16)((const Byte*)(p))[0] << 8) | ((const Byte*)(p))[1])
-
-#ifdef MY_CPU_X86_OR_AMD64
-
-    typedef struct
-{
-    UInt32 maxFunc;
-    UInt32 vendor[3];
-    UInt32 ver;
-    UInt32 b;
-    UInt32 c;
-    UInt32 d;
-} Cx86cpuid;
-
-enum {
-    CPU_FIRM_INTEL,
-    CPU_FIRM_AMD,
-    CPU_FIRM_VIA
-};
-
-Bool x86cpuid_CheckAndRead(Cx86cpuid* p);
-int x86cpuid_GetFirm(const Cx86cpuid* p);
-
-#define x86cpuid_GetFamily(p) (((p)->ver >> 8) & 0xFF00F)
-#define x86cpuid_GetModel(p) (((p)->ver >> 4) & 0xF00F)
-#define x86cpuid_GetStepping(p) ((p)->ver & 0xF)
-
-Bool CPU_Is_InOrder();
-Bool CPU_Is_Aes_Supported();
-
-#endif
-
-EXTERN_C_END
-
-#endif

fex/7z_C/Lzma2Dec.c

@@ -1,327 +0,0 @@
-/* Lzma2Dec.c -- LZMA2 Decoder
-2010-12-15 : Igor Pavlov : Public domain */
-
-/* #define SHOW_DEBUG_INFO */
-
-#ifdef SHOW_DEBUG_INFO
-#include <stdio.h>
-#endif
-
-#include <string.h>
-
-#include "Lzma2Dec.h"
-
-/*
-00000000  -  EOS
-00000001 U U  -  Uncompressed Reset Dic
-00000010 U U  -  Uncompressed No Reset
-100uuuuu U U P P  -  LZMA no reset
-101uuuuu U U P P  -  LZMA reset state
-110uuuuu U U P P S  -  LZMA reset state + new prop
-111uuuuu U U P P S  -  LZMA reset state + new prop + reset dic
-
-  u, U - Unpack Size
-  P - Pack Size
-  S - Props
-*/
-
-#define LZMA2_CONTROL_LZMA (1 << 7)
-#define LZMA2_CONTROL_COPY_NO_RESET 2
-#define LZMA2_CONTROL_COPY_RESET_DIC 1
-#define LZMA2_CONTROL_EOF 0
-
-#define LZMA2_IS_UNCOMPRESSED_STATE(p) (((p)->control & LZMA2_CONTROL_LZMA) == 0)
-
-#define LZMA2_GET_LZMA_MODE(p) (((p)->control >> 5) & 3)
-#define LZMA2_IS_THERE_PROP(mode) ((mode) >= 2)
-
-#define LZMA2_LCLP_MAX 4
-#define LZMA2_DIC_SIZE_FROM_PROP(p) (((UInt32)2 | ((p)&1)) << ((p) / 2 + 11))
-
-#ifdef SHOW_DEBUG_INFO
-#define PRF(x) x
-#else
-#define PRF(x)
-#endif
-
-typedef enum {
-    LZMA2_STATE_CONTROL,
-    LZMA2_STATE_UNPACK0,
-    LZMA2_STATE_UNPACK1,
-    LZMA2_STATE_PACK0,
-    LZMA2_STATE_PACK1,
-    LZMA2_STATE_PROP,
-    LZMA2_STATE_DATA,
-    LZMA2_STATE_DATA_CONT,
-    LZMA2_STATE_FINISHED,
-    LZMA2_STATE_ERROR
-} ELzma2State;
-
-static SRes Lzma2Dec_GetOldProps(Byte prop, Byte* props)
-{
-    UInt32 dicSize;
-    if (prop > 40)
-        return SZ_ERROR_UNSUPPORTED;
-    dicSize = (prop == 40) ? 0xFFFFFFFF : LZMA2_DIC_SIZE_FROM_PROP(prop);
-    props[0] = (Byte)LZMA2_LCLP_MAX;
-    props[1] = (Byte)(dicSize);
-    props[2] = (Byte)(dicSize >> 8);
-    props[3] = (Byte)(dicSize >> 16);
-    props[4] = (Byte)(dicSize >> 24);
-    return SZ_OK;
-}
-
-SRes Lzma2Dec_AllocateProbs(CLzma2Dec* p, Byte prop, ISzAlloc* alloc)
-{
-    Byte props[LZMA_PROPS_SIZE];
-    RINOK(Lzma2Dec_GetOldProps(prop, props));
-    return LzmaDec_AllocateProbs(&p->decoder, props, LZMA_PROPS_SIZE, alloc);
-}
-
-SRes Lzma2Dec_Allocate(CLzma2Dec* p, Byte prop, ISzAlloc* alloc)
-{
-    Byte props[LZMA_PROPS_SIZE];
-    RINOK(Lzma2Dec_GetOldProps(prop, props));
-    return LzmaDec_Allocate(&p->decoder, props, LZMA_PROPS_SIZE, alloc);
-}
-
-void Lzma2Dec_Init(CLzma2Dec* p)
-{
-    p->state = LZMA2_STATE_CONTROL;
-    p->needInitDic = True;
-    p->needInitState = True;
-    p->needInitProp = True;
-    LzmaDec_Init(&p->decoder);
-}
-
-static ELzma2State Lzma2Dec_UpdateState(CLzma2Dec* p, Byte b)
-{
-    switch (p->state) {
-    case LZMA2_STATE_CONTROL:
-        p->control = b;
-        PRF(printf("\n %4X ", p->decoder.dicPos));
-        PRF(printf(" %2X", b));
-        if (p->control == 0)
-            return LZMA2_STATE_FINISHED;
-        if (LZMA2_IS_UNCOMPRESSED_STATE(p)) {
-            if ((p->control & 0x7F) > 2)
-                return LZMA2_STATE_ERROR;
-            p->unpackSize = 0;
-        } else
-            p->unpackSize = (UInt32)(p->control & 0x1F) << 16;
-        return LZMA2_STATE_UNPACK0;
-
-    case LZMA2_STATE_UNPACK0:
-        p->unpackSize |= (UInt32)b << 8;
-        return LZMA2_STATE_UNPACK1;
-
-    case LZMA2_STATE_UNPACK1:
-        p->unpackSize |= (UInt32)b;
-        p->unpackSize++;
-        PRF(printf(" %8d", p->unpackSize));
-        return (LZMA2_IS_UNCOMPRESSED_STATE(p)) ? LZMA2_STATE_DATA : LZMA2_STATE_PACK0;
-
-    case LZMA2_STATE_PACK0:
-        p->packSize = (UInt32)b << 8;
-        return LZMA2_STATE_PACK1;
-
-    case LZMA2_STATE_PACK1:
-        p->packSize |= (UInt32)b;
-        p->packSize++;
-        PRF(printf(" %8d", p->packSize));
-        return LZMA2_IS_THERE_PROP(LZMA2_GET_LZMA_MODE(p)) ? LZMA2_STATE_PROP : (p->needInitProp ? LZMA2_STATE_ERROR : LZMA2_STATE_DATA);
-
-    case LZMA2_STATE_PROP: {
-        int lc, lp;
-        if (b >= (9 * 5 * 5))
-            return LZMA2_STATE_ERROR;
-        lc = b % 9;
-        b /= 9;
-        p->decoder.prop.pb = b / 5;
-        lp = b % 5;
-        if (lc + lp > LZMA2_LCLP_MAX)
-            return LZMA2_STATE_ERROR;
-        p->decoder.prop.lc = lc;
-        p->decoder.prop.lp = lp;
-        p->needInitProp = False;
-        return LZMA2_STATE_DATA;
-    }
-    }
-    return LZMA2_STATE_ERROR;
-}
-
-static void LzmaDec_UpdateWithUncompressed(CLzmaDec* p, const Byte* src, SizeT size)
-{
-    memcpy(p->dic + p->dicPos, src, size);
-    p->dicPos += size;
-    if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= size)
-        p->checkDicSize = p->prop.dicSize;
-    p->processedPos += (UInt32)size;
-}
-
-void LzmaDec_InitDicAndState(CLzmaDec* p, Bool initDic, Bool initState);
-
-SRes Lzma2Dec_DecodeToDic(CLzma2Dec* p, SizeT dicLimit,
-    const Byte* src, SizeT* srcLen, ELzmaFinishMode finishMode, ELzmaStatus* status)
-{
-    SizeT inSize = *srcLen;
-    *srcLen = 0;
-    *status = LZMA_STATUS_NOT_SPECIFIED;
-
-    while (p->state != LZMA2_STATE_FINISHED) {
-        SizeT dicPos = p->decoder.dicPos;
-        if (p->state == LZMA2_STATE_ERROR)
-            return SZ_ERROR_DATA;
-        if (dicPos == dicLimit && finishMode == LZMA_FINISH_ANY) {
-            *status = LZMA_STATUS_NOT_FINISHED;
-            return SZ_OK;
-        }
-        if (p->state != LZMA2_STATE_DATA && p->state != LZMA2_STATE_DATA_CONT) {
-            if (*srcLen == inSize) {
-                *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-                return SZ_OK;
-            }
-            (*srcLen)++;
-            p->state = Lzma2Dec_UpdateState(p, *src++);
-            continue;
-        }
-        {
-            SizeT destSizeCur = dicLimit - dicPos;
-            SizeT srcSizeCur = inSize - *srcLen;
-            ELzmaFinishMode curFinishMode = LZMA_FINISH_ANY;
-
-            if (p->unpackSize <= destSizeCur) {
-                destSizeCur = (SizeT)p->unpackSize;
-                curFinishMode = LZMA_FINISH_END;
-            }
-
-            if (LZMA2_IS_UNCOMPRESSED_STATE(p)) {
-                if (*srcLen == inSize) {
-                    *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-                    return SZ_OK;
-                }
-
-                if (p->state == LZMA2_STATE_DATA) {
-                    Bool initDic = (p->control == LZMA2_CONTROL_COPY_RESET_DIC);
-                    if (initDic)
-                        p->needInitProp = p->needInitState = True;
-                    else if (p->needInitDic)
-                        return SZ_ERROR_DATA;
-                    p->needInitDic = False;
-                    LzmaDec_InitDicAndState(&p->decoder, initDic, False);
-                }
-
-                if (srcSizeCur > destSizeCur)
-                    srcSizeCur = destSizeCur;
-
-                if (srcSizeCur == 0)
-                    return SZ_ERROR_DATA;
-
-                LzmaDec_UpdateWithUncompressed(&p->decoder, src, srcSizeCur);
-
-                src += srcSizeCur;
-                *srcLen += srcSizeCur;
-                p->unpackSize -= (UInt32)srcSizeCur;
-                p->state = (p->unpackSize == 0) ? LZMA2_STATE_CONTROL : LZMA2_STATE_DATA_CONT;
-            } else {
-                SizeT outSizeProcessed;
-                SRes res;
-
-                if (p->state == LZMA2_STATE_DATA) {
-                    int mode = LZMA2_GET_LZMA_MODE(p);
-                    Bool initDic = (mode == 3);
-                    Bool initState = (mode > 0);
-                    if ((!initDic && p->needInitDic) || (!initState && p->needInitState))
-                        return SZ_ERROR_DATA;
-
-                    LzmaDec_InitDicAndState(&p->decoder, initDic, initState);
-                    p->needInitDic = False;
-                    p->needInitState = False;
-                    p->state = LZMA2_STATE_DATA_CONT;
-                }
-                if (srcSizeCur > p->packSize)
-                    srcSizeCur = (SizeT)p->packSize;
-
-                res = LzmaDec_DecodeToDic(&p->decoder, dicPos + destSizeCur, src, &srcSizeCur, curFinishMode, status);
-
-                src += srcSizeCur;
-                *srcLen += srcSizeCur;
-                p->packSize -= (UInt32)srcSizeCur;
-
-                outSizeProcessed = p->decoder.dicPos - dicPos;
-                p->unpackSize -= (UInt32)outSizeProcessed;
-
-                RINOK(res);
-                if (*status == LZMA_STATUS_NEEDS_MORE_INPUT)
-                    return res;
-
-                if (srcSizeCur == 0 && outSizeProcessed == 0) {
-                    if (*status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK || p->unpackSize != 0 || p->packSize != 0)
-                        return SZ_ERROR_DATA;
-                    p->state = LZMA2_STATE_CONTROL;
-                }
-                if (*status == LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK)
-                    *status = LZMA_STATUS_NOT_FINISHED;
-            }
-        }
-    }
-    *status = LZMA_STATUS_FINISHED_WITH_MARK;
-    return SZ_OK;
-}
-
-SRes Lzma2Dec_DecodeToBuf(CLzma2Dec* p, Byte* dest, SizeT* destLen, const Byte* src, SizeT* srcLen, ELzmaFinishMode finishMode, ELzmaStatus* status)
-{
-    SizeT outSize = *destLen, inSize = *srcLen;
-    *srcLen = *destLen = 0;
-    for (;;) {
-        SizeT srcSizeCur = inSize, outSizeCur, dicPos;
-        ELzmaFinishMode curFinishMode;
-        SRes res;
-        if (p->decoder.dicPos == p->decoder.dicBufSize)
-            p->decoder.dicPos = 0;
-        dicPos = p->decoder.dicPos;
-        if (outSize > p->decoder.dicBufSize - dicPos) {
-            outSizeCur = p->decoder.dicBufSize;
-            curFinishMode = LZMA_FINISH_ANY;
-        } else {
-            outSizeCur = dicPos + outSize;
-            curFinishMode = finishMode;
-        }
-
-        res = Lzma2Dec_DecodeToDic(p, outSizeCur, src, &srcSizeCur, curFinishMode, status);
-        src += srcSizeCur;
-        inSize -= srcSizeCur;
-        *srcLen += srcSizeCur;
-        outSizeCur = p->decoder.dicPos - dicPos;
-        memcpy(dest, p->decoder.dic + dicPos, outSizeCur);
-        dest += outSizeCur;
-        outSize -= outSizeCur;
-        *destLen += outSizeCur;
-        if (res != 0)
-            return res;
-        if (outSizeCur == 0 || outSize == 0)
-            return SZ_OK;
-    }
-}
-
-SRes Lzma2Decode(Byte* dest, SizeT* destLen, const Byte* src, SizeT* srcLen,
-    Byte prop, ELzmaFinishMode finishMode, ELzmaStatus* status, ISzAlloc* alloc)
-{
-    CLzma2Dec p;
-    SRes res;
-    SizeT outSize = *destLen, inSize = *srcLen;
-    *destLen = *srcLen = 0;
-    *status = LZMA_STATUS_NOT_SPECIFIED;
-    Lzma2Dec_Construct(&p);
-    RINOK(Lzma2Dec_AllocateProbs(&p, prop, alloc));
-    p.decoder.dic = dest;
-    p.decoder.dicBufSize = outSize;
-    Lzma2Dec_Init(&p);
-    *srcLen = inSize;
-    res = Lzma2Dec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-    *destLen = p.decoder.dicPos;
-    if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-        res = SZ_ERROR_INPUT_EOF;
-    Lzma2Dec_FreeProbs(&p, alloc);
-    return res;
-}

fex/7z_C/Lzma2Dec.h

@@ -1,82 +0,0 @@
-/* Lzma2Dec.h -- LZMA2 Decoder
-2009-05-03 : Igor Pavlov : Public domain */
-
-#ifndef __LZMA2_DEC_H
-#define __LZMA2_DEC_H
-
-#include "LzmaDec.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ---------- State Interface ---------- */
-
-typedef struct
-{
-    CLzmaDec decoder;
-    UInt32 packSize;
-    UInt32 unpackSize;
-    int state;
-    Byte control;
-    Bool needInitDic;
-    Bool needInitState;
-    Bool needInitProp;
-} CLzma2Dec;
-
-#define Lzma2Dec_Construct(p) LzmaDec_Construct(&(p)->decoder)
-#define Lzma2Dec_FreeProbs(p, alloc) LzmaDec_FreeProbs(&(p)->decoder, alloc);
-#define Lzma2Dec_Free(p, alloc) LzmaDec_Free(&(p)->decoder, alloc);
-
-SRes Lzma2Dec_AllocateProbs(CLzma2Dec* p, Byte prop, ISzAlloc* alloc);
-SRes Lzma2Dec_Allocate(CLzma2Dec* p, Byte prop, ISzAlloc* alloc);
-void Lzma2Dec_Init(CLzma2Dec* p);
-
-/*
-finishMode:
-  It has meaning only if the decoding reaches output limit (*destLen or dicLimit).
-  LZMA_FINISH_ANY - use smallest number of input bytes
-  LZMA_FINISH_END - read EndOfStream marker after decoding
-
-Returns:
-  SZ_OK
-    status:
-      LZMA_STATUS_FINISHED_WITH_MARK
-      LZMA_STATUS_NOT_FINISHED
-      LZMA_STATUS_NEEDS_MORE_INPUT
-  SZ_ERROR_DATA - Data error
-*/
-
-SRes Lzma2Dec_DecodeToDic(CLzma2Dec* p, SizeT dicLimit,
-    const Byte* src, SizeT* srcLen, ELzmaFinishMode finishMode, ELzmaStatus* status);
-
-SRes Lzma2Dec_DecodeToBuf(CLzma2Dec* p, Byte* dest, SizeT* destLen,
-    const Byte* src, SizeT* srcLen, ELzmaFinishMode finishMode, ELzmaStatus* status);
-
-/* ---------- One Call Interface ---------- */
-
-/*
-finishMode:
-  It has meaning only if the decoding reaches output limit (*destLen).
-  LZMA_FINISH_ANY - use smallest number of input bytes
-  LZMA_FINISH_END - read EndOfStream marker after decoding
-
-Returns:
-  SZ_OK
-    status:
-      LZMA_STATUS_FINISHED_WITH_MARK
-      LZMA_STATUS_NOT_FINISHED
-  SZ_ERROR_DATA - Data error
-  SZ_ERROR_MEM  - Memory allocation error
-  SZ_ERROR_UNSUPPORTED - Unsupported properties
-  SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
-*/
-
-SRes Lzma2Decode(Byte* dest, SizeT* destLen, const Byte* src, SizeT* srcLen,
-    Byte prop, ELzmaFinishMode finishMode, ELzmaStatus* status, ISzAlloc* alloc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

fex/7z_C/LzmaDec.c

@@ -1,980 +0,0 @@
-/* LzmaDec.c -- LZMA Decoder
-2010-12-15 : Igor Pavlov : Public domain */
-
-#include "LzmaDec.h"
-
-#include <string.h>
-
-#define kNumTopBits 24
-#define kTopValue ((UInt32)1 << kNumTopBits)
-
-#define kNumBitModelTotalBits 11
-#define kBitModelTotal (1 << kNumBitModelTotalBits)
-#define kNumMoveBits 5
-
-#define RC_INIT_SIZE 5
-
-#define NORMALIZE                      \
-    if (range < kTopValue) {           \
-        range <<= 8;                   \
-        code = (code << 8) | (*buf++); \
-    }
-
-#define IF_BIT_0(p)                                 \
-    ttt = *(p);                                     \
-    NORMALIZE;                                      \
-    bound = (range >> kNumBitModelTotalBits) * ttt; \
-    if (code < bound)
-#define UPDATE_0(p) \
-    range = bound;  \
-    *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));
-#define UPDATE_1(p) \
-    range -= bound; \
-    code -= bound;  \
-    *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));
-#define GET_BIT2(p, i, A0, A1) \
-    IF_BIT_0(p)                \
-    {                          \
-        UPDATE_0(p);           \
-        i = (i + i);           \
-        A0;                    \
-    }                          \
-    else                       \
-    {                          \
-        UPDATE_1(p);           \
-        i = (i + i) + 1;       \
-        A1;                    \
-    }
-#define GET_BIT(p, i) GET_BIT2(p, i, ;, ;)
-
-#define TREE_GET_BIT(probs, i)   \
-    {                            \
-        GET_BIT((probs + i), i); \
-    }
-#define TREE_DECODE(probs, limit, i) \
-    {                                \
-        i = 1;                       \
-        do {                         \
-            TREE_GET_BIT(probs, i);  \
-        } while (i < limit);         \
-        i -= limit;                  \
-    }
-
-/* #define _LZMA_SIZE_OPT */
-
-#ifdef _LZMA_SIZE_OPT
-#define TREE_6_DECODE(probs, i) TREE_DECODE(probs, (1 << 6), i)
-#else
-#define TREE_6_DECODE(probs, i) \
-    {                           \
-        i = 1;                  \
-        TREE_GET_BIT(probs, i); \
-        TREE_GET_BIT(probs, i); \
-        TREE_GET_BIT(probs, i); \
-        TREE_GET_BIT(probs, i); \
-        TREE_GET_BIT(probs, i); \
-        TREE_GET_BIT(probs, i); \
-        i -= 0x40;              \
-    }
-#endif
-
-#define NORMALIZE_CHECK                \
-    if (range < kTopValue) {           \
-        if (buf >= bufLimit)           \
-            return DUMMY_ERROR;        \
-        range <<= 8;                   \
-        code = (code << 8) | (*buf++); \
-    }
-
-#define IF_BIT_0_CHECK(p)                           \
-    ttt = *(p);                                     \
-    NORMALIZE_CHECK;                                \
-    bound = (range >> kNumBitModelTotalBits) * ttt; \
-    if (code < bound)
-#define UPDATE_0_CHECK range = bound;
-#define UPDATE_1_CHECK \
-    range -= bound;    \
-    code -= bound;
-#define GET_BIT2_CHECK(p, i, A0, A1) \
-    IF_BIT_0_CHECK(p)                \
-    {                                \
-        UPDATE_0_CHECK;              \
-        i = (i + i);                 \
-        A0;                          \
-    }                                \
-    else                             \
-    {                                \
-        UPDATE_1_CHECK;              \
-        i = (i + i) + 1;             \
-        A1;                          \
-    }
-#define GET_BIT_CHECK(p, i) GET_BIT2_CHECK(p, i, ;, ;)
-#define TREE_DECODE_CHECK(probs, limit, i) \
-    {                                      \
-        i = 1;                             \
-        do {                               \
-            GET_BIT_CHECK(probs + i, i)    \
-        } while (i < limit);               \
-        i -= limit;                        \
-    }
-
-#define kNumPosBitsMax 4
-#define kNumPosStatesMax (1 << kNumPosBitsMax)
-
-#define kLenNumLowBits 3
-#define kLenNumLowSymbols (1 << kLenNumLowBits)
-#define kLenNumMidBits 3
-#define kLenNumMidSymbols (1 << kLenNumMidBits)
-#define kLenNumHighBits 8
-#define kLenNumHighSymbols (1 << kLenNumHighBits)
-
-#define LenChoice 0
-#define LenChoice2 (LenChoice + 1)
-#define LenLow (LenChoice2 + 1)
-#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-#define kNumLenProbs (LenHigh + kLenNumHighSymbols)
-
-#define kNumStates 12
-#define kNumLitStates 7
-
-#define kStartPosModelIndex 4
-#define kEndPosModelIndex 14
-#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-
-#define kNumPosSlotBits 6
-#define kNumLenToPosStates 4
-
-#define kNumAlignBits 4
-#define kAlignTableSize (1 << kNumAlignBits)
-
-#define kMatchMinLen 2
-#define kMatchSpecLenStart (kMatchMinLen + kLenNumLowSymbols + kLenNumMidSymbols + kLenNumHighSymbols)
-
-#define IsMatch 0
-#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-#define IsRepG0 (IsRep + kNumStates)
-#define IsRepG1 (IsRepG0 + kNumStates)
-#define IsRepG2 (IsRepG1 + kNumStates)
-#define IsRep0Long (IsRepG2 + kNumStates)
-#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-#define LenCoder (Align + kAlignTableSize)
-#define RepLenCoder (LenCoder + kNumLenProbs)
-#define Literal (RepLenCoder + kNumLenProbs)
-
-#define LZMA_BASE_SIZE 1846
-#define LZMA_LIT_SIZE 768
-
-#define LzmaProps_GetNumProbs(p) ((UInt32)LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((p)->lc + (p)->lp)))
-
-#if Literal != LZMA_BASE_SIZE
-StopCompilingDueBUG
-#endif
-
-#define LZMA_DIC_MIN (1 << 12)
-
-    /* First LZMA-symbol is always decoded.
-And it decodes new LZMA-symbols while (buf < bufLimit), but "buf" is without last normalization
-Out:
-  Result:
-    SZ_OK - OK
-    SZ_ERROR_DATA - Error
-  p->remainLen:
-    < kMatchSpecLenStart : normal remain
-    = kMatchSpecLenStart : finished
-    = kMatchSpecLenStart + 1 : Flush marker
-    = kMatchSpecLenStart + 2 : State Init Marker
-*/
-
-    static int MY_FAST_CALL
-    LzmaDec_DecodeReal(CLzmaDec* p, SizeT limit, const Byte* bufLimit)
-{
-    CLzmaProb* probs = p->probs;
-
-    unsigned state = p->state;
-    UInt32 rep0 = p->reps[0], rep1 = p->reps[1], rep2 = p->reps[2], rep3 = p->reps[3];
-    unsigned pbMask = ((unsigned)1 << (p->prop.pb)) - 1;
-    unsigned lpMask = ((unsigned)1 << (p->prop.lp)) - 1;
-    unsigned lc = p->prop.lc;
-
-    Byte* dic = p->dic;
-    SizeT dicBufSize = p->dicBufSize;
-    SizeT dicPos = p->dicPos;
-
-    UInt32 processedPos = p->processedPos;
-    UInt32 checkDicSize = p->checkDicSize;
-    unsigned len = 0;
-
-    const Byte* buf = p->buf;
-    UInt32 range = p->range;
-    UInt32 code = p->code;
-
-    do {
-        CLzmaProb* prob;
-        UInt32 bound;
-        unsigned ttt;
-        unsigned posState = processedPos & pbMask;
-
-        prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-        IF_BIT_0(prob)
-        {
-            unsigned symbol;
-            UPDATE_0(prob);
-            prob = probs + Literal;
-            if (checkDicSize != 0 || processedPos != 0)
-                prob += (LZMA_LIT_SIZE * (((processedPos & lpMask) << lc) + (dic[(dicPos == 0 ? dicBufSize : dicPos) - 1] >> (8 - lc))));
-
-            if (state < kNumLitStates) {
-                state -= (state < 4) ? state : 3;
-                symbol = 1;
-                do {
-                    GET_BIT(prob + symbol, symbol)
-                } while (symbol < 0x100);
-            } else {
-                unsigned matchByte = p->dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-                unsigned offs = 0x100;
-                state -= (state < 10) ? 3 : 6;
-                symbol = 1;
-                do {
-                    unsigned bit;
-                    CLzmaProb* probLit;
-                    matchByte <<= 1;
-                    bit = (matchByte & offs);
-                    probLit = prob + offs + bit + symbol;
-                    GET_BIT2(probLit, symbol, offs &= ~bit, offs &= bit)
-                } while (symbol < 0x100);
-            }
-            dic[dicPos++] = (Byte)symbol;
-            processedPos++;
-            continue;
-        }
-        else
-        {
-            UPDATE_1(prob);
-            prob = probs + IsRep + state;
-            IF_BIT_0(prob)
-            {
-                UPDATE_0(prob);
-                state += kNumStates;
-                prob = probs + LenCoder;
-            }
-            else
-            {
-                UPDATE_1(prob);
-                if (checkDicSize == 0 && processedPos == 0)
-                    return SZ_ERROR_DATA;
-                prob = probs + IsRepG0 + state;
-                IF_BIT_0(prob)
-                {
-                    UPDATE_0(prob);
-                    prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-                    IF_BIT_0(prob)
-                    {
-                        UPDATE_0(prob);
-                        dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-                        dicPos++;
-                        processedPos++;
-                        state = state < kNumLitStates ? 9 : 11;
-                        continue;
-                    }
-                    UPDATE_1(prob);
-                }
-                else
-                {
-                    UInt32 distance;
-                    UPDATE_1(prob);
-                    prob = probs + IsRepG1 + state;
-                    IF_BIT_0(prob)
-                    {
-                        UPDATE_0(prob);
-                        distance = rep1;
-                    }
-                    else
-                    {
-                        UPDATE_1(prob);
-                        prob = probs + IsRepG2 + state;
-                        IF_BIT_0(prob)
-                        {
-                            UPDATE_0(prob);
-                            distance = rep2;
-                        }
-                        else
-                        {
-                            UPDATE_1(prob);
-                            distance = rep3;
-                            rep3 = rep2;
-                        }
-                        rep2 = rep1;
-                    }
-                    rep1 = rep0;
-                    rep0 = distance;
-                }
-                state = state < kNumLitStates ? 8 : 11;
-                prob = probs + RepLenCoder;
-            }
-            {
-                unsigned limit, offset;
-                CLzmaProb* probLen = prob + LenChoice;
-                IF_BIT_0(probLen)
-                {
-                    UPDATE_0(probLen);
-                    probLen = prob + LenLow + (posState << kLenNumLowBits);
-                    offset = 0;
-                    limit = (1 << kLenNumLowBits);
-                }
-                else
-                {
-                    UPDATE_1(probLen);
-                    probLen = prob + LenChoice2;
-                    IF_BIT_0(probLen)
-                    {
-                        UPDATE_0(probLen);
-                        probLen = prob + LenMid + (posState << kLenNumMidBits);
-                        offset = kLenNumLowSymbols;
-                        limit = (1 << kLenNumMidBits);
-                    }
-                    else
-                    {
-                        UPDATE_1(probLen);
-                        probLen = prob + LenHigh;
-                        offset = kLenNumLowSymbols + kLenNumMidSymbols;
-                        limit = (1 << kLenNumHighBits);
-                    }
-                }
-                TREE_DECODE(probLen, limit, len);
-                len += offset;
-            }
-
-            if (state >= kNumStates) {
-                UInt32 distance;
-                prob = probs + PosSlot + ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-                TREE_6_DECODE(prob, distance);
-                if (distance >= kStartPosModelIndex) {
-                    unsigned posSlot = (unsigned)distance;
-                    int numDirectBits = (int)(((distance >> 1) - 1));
-                    distance = (2 | (distance & 1));
-                    if (posSlot < kEndPosModelIndex) {
-                        distance <<= numDirectBits;
-                        prob = probs + SpecPos + distance - posSlot - 1;
-                        {
-                            UInt32 mask = 1;
-                            unsigned i = 1;
-                            do {
-                                GET_BIT2(prob + i, i, ;, distance |= mask);
-                                mask <<= 1;
-                            } while (--numDirectBits != 0);
-                        }
-                    } else {
-                        numDirectBits -= kNumAlignBits;
-                        do {
-                            NORMALIZE
-                            range >>= 1;
-
-                            {
-                                UInt32 t;
-                                code -= range;
-                                t = (0 - ((UInt32)code >> 31)); /* (UInt32)((Int32)code >> 31) */
-                                distance = (distance << 1) + (t + 1);
-                                code += range & t;
-                            }
-                            /*
-              distance <<= 1;
-              if (code >= range)
-              {
-                code -= range;
-                distance |= 1;
-              }
-              */
-                        } while (--numDirectBits != 0);
-                        prob = probs + Align;
-                        distance <<= kNumAlignBits;
-                        {
-                            unsigned i = 1;
-                            GET_BIT2(prob + i, i, ;, distance |= 1);
-                            GET_BIT2(prob + i, i, ;, distance |= 2);
-                            GET_BIT2(prob + i, i, ;, distance |= 4);
-                            GET_BIT2(prob + i, i, ;, distance |= 8);
-                        }
-                        if (distance == (UInt32)0xFFFFFFFF) {
-                            len += kMatchSpecLenStart;
-                            state -= kNumStates;
-                            break;
-                        }
-                    }
-                }
-                rep3 = rep2;
-                rep2 = rep1;
-                rep1 = rep0;
-                rep0 = distance + 1;
-                if (checkDicSize == 0) {
-                    if (distance >= processedPos)
-                        return SZ_ERROR_DATA;
-                } else if (distance >= checkDicSize)
-                    return SZ_ERROR_DATA;
-                state = (state < kNumStates + kNumLitStates) ? kNumLitStates : kNumLitStates + 3;
-            }
-
-            len += kMatchMinLen;
-
-            if (limit == dicPos)
-                return SZ_ERROR_DATA;
-            {
-                SizeT rem = limit - dicPos;
-                unsigned curLen = ((rem < len) ? (unsigned)rem : len);
-                SizeT pos = (dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0);
-
-                processedPos += curLen;
-
-                len -= curLen;
-                if (pos + curLen <= dicBufSize) {
-                    Byte* dest = dic + dicPos;
-                    ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;
-                    const Byte* lim = dest + curLen;
-                    dicPos += curLen;
-                    do
-                        *(dest) = (Byte) * (dest + src);
-                    while (++dest != lim);
-                } else {
-                    do {
-                        dic[dicPos++] = dic[pos];
-                        if (++pos == dicBufSize)
-                            pos = 0;
-                    } while (--curLen != 0);
-                }
-            }
-        }
-    } while (dicPos < limit && buf < bufLimit);
-    NORMALIZE;
-    p->buf = buf;
-    p->range = range;
-    p->code = code;
-    p->remainLen = len;
-    p->dicPos = dicPos;
-    p->processedPos = processedPos;
-    p->reps[0] = rep0;
-    p->reps[1] = rep1;
-    p->reps[2] = rep2;
-    p->reps[3] = rep3;
-    p->state = state;
-
-    return SZ_OK;
-}
-
-static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec* p, SizeT limit)
-{
-    if (p->remainLen != 0 && p->remainLen < kMatchSpecLenStart) {
-        Byte* dic = p->dic;
-        SizeT dicPos = p->dicPos;
-        SizeT dicBufSize = p->dicBufSize;
-        unsigned len = p->remainLen;
-        UInt32 rep0 = p->reps[0];
-        if (limit - dicPos < len)
-            len = (unsigned)(limit - dicPos);
-
-        if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)
-            p->checkDicSize = p->prop.dicSize;
-
-        p->processedPos += len;
-        p->remainLen -= len;
-        while (len != 0) {
-            len--;
-            dic[dicPos] = dic[(dicPos - rep0) + ((dicPos < rep0) ? dicBufSize : 0)];
-            dicPos++;
-        }
-        p->dicPos = dicPos;
-    }
-}
-
-static int MY_FAST_CALL LzmaDec_DecodeReal2(CLzmaDec* p, SizeT limit, const Byte* bufLimit)
-{
-    do {
-        SizeT limit2 = limit;
-        if (p->checkDicSize == 0) {
-            UInt32 rem = p->prop.dicSize - p->processedPos;
-            if (limit - p->dicPos > rem)
-                limit2 = p->dicPos + rem;
-        }
-        RINOK(LzmaDec_DecodeReal(p, limit2, bufLimit));
-        if (p->processedPos >= p->prop.dicSize)
-            p->checkDicSize = p->prop.dicSize;
-        LzmaDec_WriteRem(p, limit);
-    } while (p->dicPos < limit && p->buf < bufLimit && p->remainLen < kMatchSpecLenStart);
-
-    if (p->remainLen > kMatchSpecLenStart) {
-        p->remainLen = kMatchSpecLenStart;
-    }
-    return 0;
-}
-
-typedef enum {
-    DUMMY_ERROR, /* unexpected end of input stream */
-    DUMMY_LIT,
-    DUMMY_MATCH,
-    DUMMY_REP
-} ELzmaDummy;
-
-static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec* p, const Byte* buf, SizeT inSize)
-{
-    UInt32 range = p->range;
-    UInt32 code = p->code;
-    const Byte* bufLimit = buf + inSize;
-    CLzmaProb* probs = p->probs;
-    unsigned state = p->state;
-    ELzmaDummy res;
-
-    {
-        CLzmaProb* prob;
-        UInt32 bound;
-        unsigned ttt;
-        unsigned posState = (p->processedPos) & ((1 << p->prop.pb) - 1);
-
-        prob = probs + IsMatch + (state << kNumPosBitsMax) + posState;
-        IF_BIT_0_CHECK(prob)
-        {
-            UPDATE_0_CHECK
-
-            /* if (bufLimit - buf >= 7) return DUMMY_LIT; */
-
-            prob = probs + Literal;
-            if (p->checkDicSize != 0 || p->processedPos != 0)
-                prob += (LZMA_LIT_SIZE * ((((p->processedPos) & ((1 << (p->prop.lp)) - 1)) << p->prop.lc) + (p->dic[(p->dicPos == 0 ? p->dicBufSize : p->dicPos) - 1] >> (8 - p->prop.lc))));
-
-            if (state < kNumLitStates) {
-                unsigned symbol = 1;
-                do {
-                    GET_BIT_CHECK(prob + symbol, symbol)
-                } while (symbol < 0x100);
-            } else {
-                unsigned matchByte = p->dic[p->dicPos - p->reps[0] + ((p->dicPos < p->reps[0]) ? p->dicBufSize : 0)];
-                unsigned offs = 0x100;
-                unsigned symbol = 1;
-                do {
-                    unsigned bit;
-                    CLzmaProb* probLit;
-                    matchByte <<= 1;
-                    bit = (matchByte & offs);
-                    probLit = prob + offs + bit + symbol;
-                    GET_BIT2_CHECK(probLit, symbol, offs &= ~bit, offs &= bit)
-                } while (symbol < 0x100);
-            }
-            res = DUMMY_LIT;
-        }
-        else
-        {
-            unsigned len;
-            UPDATE_1_CHECK;
-
-            prob = probs + IsRep + state;
-            IF_BIT_0_CHECK(prob)
-            {
-                UPDATE_0_CHECK;
-                state = 0;
-                prob = probs + LenCoder;
-                res = DUMMY_MATCH;
-            }
-            else
-            {
-                UPDATE_1_CHECK;
-                res = DUMMY_REP;
-                prob = probs + IsRepG0 + state;
-                IF_BIT_0_CHECK(prob)
-                {
-                    UPDATE_0_CHECK;
-                    prob = probs + IsRep0Long + (state << kNumPosBitsMax) + posState;
-                    IF_BIT_0_CHECK(prob)
-                    {
-                        UPDATE_0_CHECK;
-                        NORMALIZE_CHECK;
-                        return DUMMY_REP;
-                    }
-                    else
-                    {
-                        UPDATE_1_CHECK;
-                    }
-                }
-                else
-                {
-                    UPDATE_1_CHECK;
-                    prob = probs + IsRepG1 + state;
-                    IF_BIT_0_CHECK(prob)
-                    {
-                        UPDATE_0_CHECK;
-                    }
-                    else
-                    {
-                        UPDATE_1_CHECK;
-                        prob = probs + IsRepG2 + state;
-                        IF_BIT_0_CHECK(prob)
-                        {
-                            UPDATE_0_CHECK;
-                        }
-                        else
-                        {
-                            UPDATE_1_CHECK;
-                        }
-                    }
-                }
-                state = kNumStates;
-                prob = probs + RepLenCoder;
-            }
-            {
-                unsigned limit, offset;
-                CLzmaProb* probLen = prob + LenChoice;
-                IF_BIT_0_CHECK(probLen)
-                {
-                    UPDATE_0_CHECK;
-                    probLen = prob + LenLow + (posState << kLenNumLowBits);
-                    offset = 0;
-                    limit = 1 << kLenNumLowBits;
-                }
-                else
-                {
-                    UPDATE_1_CHECK;
-                    probLen = prob + LenChoice2;
-                    IF_BIT_0_CHECK(probLen)
-                    {
-                        UPDATE_0_CHECK;
-                        probLen = prob + LenMid + (posState << kLenNumMidBits);
-                        offset = kLenNumLowSymbols;
-                        limit = 1 << kLenNumMidBits;
-                    }
-                    else
-                    {
-                        UPDATE_1_CHECK;
-                        probLen = prob + LenHigh;
-                        offset = kLenNumLowSymbols + kLenNumMidSymbols;
-                        limit = 1 << kLenNumHighBits;
-                    }
-                }
-                TREE_DECODE_CHECK(probLen, limit, len);
-                len += offset;
-            }
-
-            if (state < 4) {
-                unsigned posSlot;
-                prob = probs + PosSlot + ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << kNumPosSlotBits);
-                TREE_DECODE_CHECK(prob, 1 << kNumPosSlotBits, posSlot);
-                if (posSlot >= kStartPosModelIndex) {
-                    int numDirectBits = ((posSlot >> 1) - 1);
-
-                    /* if (bufLimit - buf >= 8) return DUMMY_MATCH; */
-
-                    if (posSlot < kEndPosModelIndex) {
-                        prob = probs + SpecPos + ((2 | (posSlot & 1)) << numDirectBits) - posSlot - 1;
-                    } else {
-                        numDirectBits -= kNumAlignBits;
-                        do {
-                            NORMALIZE_CHECK
-                            range >>= 1;
-                            code -= range & (((code - range) >> 31) - 1);
-                            /* if (code >= range) code -= range; */
-                        } while (--numDirectBits != 0);
-                        prob = probs + Align;
-                        numDirectBits = kNumAlignBits;
-                    }
-                    {
-                        unsigned i = 1;
-                        do {
-                            GET_BIT_CHECK(prob + i, i);
-                        } while (--numDirectBits != 0);
-                    }
-                }
-            }
-        }
-    }
-    NORMALIZE_CHECK;
-    return res;
-}
-
-static void LzmaDec_InitRc(CLzmaDec* p, const Byte* data)
-{
-    p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]);
-    p->range = 0xFFFFFFFF;
-    p->needFlush = 0;
-}
-
-void LzmaDec_InitDicAndState(CLzmaDec* p, Bool initDic, Bool initState)
-{
-    p->needFlush = 1;
-    p->remainLen = 0;
-    p->tempBufSize = 0;
-
-    if (initDic) {
-        p->processedPos = 0;
-        p->checkDicSize = 0;
-        p->needInitState = 1;
-    }
-    if (initState)
-        p->needInitState = 1;
-}
-
-void LzmaDec_Init(CLzmaDec* p)
-{
-    p->dicPos = 0;
-    LzmaDec_InitDicAndState(p, True, True);
-}
-
-static void LzmaDec_InitStateReal(CLzmaDec* p)
-{
-    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (p->prop.lc + p->prop.lp));
-    UInt32 i;
-    CLzmaProb* probs = p->probs;
-    for (i = 0; i < numProbs; i++)
-        probs[i] = kBitModelTotal >> 1;
-    p->reps[0] = p->reps[1] = p->reps[2] = p->reps[3] = 1;
-    p->state = 0;
-    p->needInitState = 0;
-}
-
-SRes LzmaDec_DecodeToDic(CLzmaDec* p, SizeT dicLimit, const Byte* src, SizeT* srcLen,
-    ELzmaFinishMode finishMode, ELzmaStatus* status)
-{
-    SizeT inSize = *srcLen;
-    (*srcLen) = 0;
-    LzmaDec_WriteRem(p, dicLimit);
-
-    *status = LZMA_STATUS_NOT_SPECIFIED;
-
-    while (p->remainLen != kMatchSpecLenStart) {
-        int checkEndMarkNow;
-
-        if (p->needFlush != 0) {
-            for (; inSize > 0 && p->tempBufSize < RC_INIT_SIZE; (*srcLen)++, inSize--)
-                p->tempBuf[p->tempBufSize++] = *src++;
-            if (p->tempBufSize < RC_INIT_SIZE) {
-                *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-                return SZ_OK;
-            }
-            if (p->tempBuf[0] != 0)
-                return SZ_ERROR_DATA;
-
-            LzmaDec_InitRc(p, p->tempBuf);
-            p->tempBufSize = 0;
-        }
-
-        checkEndMarkNow = 0;
-        if (p->dicPos >= dicLimit) {
-            if (p->remainLen == 0 && p->code == 0) {
-                *status = LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK;
-                return SZ_OK;
-            }
-            if (finishMode == LZMA_FINISH_ANY) {
-                *status = LZMA_STATUS_NOT_FINISHED;
-                return SZ_OK;
-            }
-            if (p->remainLen != 0) {
-                *status = LZMA_STATUS_NOT_FINISHED;
-                return SZ_ERROR_DATA;
-            }
-            checkEndMarkNow = 1;
-        }
-
-        if (p->needInitState)
-            LzmaDec_InitStateReal(p);
-
-        if (p->tempBufSize == 0) {
-            SizeT processed;
-            const Byte* bufLimit;
-            if (inSize < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) {
-                int dummyRes = LzmaDec_TryDummy(p, src, inSize);
-                if (dummyRes == DUMMY_ERROR) {
-                    memcpy(p->tempBuf, src, inSize);
-                    p->tempBufSize = (unsigned)inSize;
-                    (*srcLen) += inSize;
-                    *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-                    return SZ_OK;
-                }
-                if (checkEndMarkNow && dummyRes != DUMMY_MATCH) {
-                    *status = LZMA_STATUS_NOT_FINISHED;
-                    return SZ_ERROR_DATA;
-                }
-                bufLimit = src;
-            } else
-                bufLimit = src + inSize - LZMA_REQUIRED_INPUT_MAX;
-            p->buf = src;
-            if (LzmaDec_DecodeReal2(p, dicLimit, bufLimit) != 0)
-                return SZ_ERROR_DATA;
-            processed = (SizeT)(p->buf - src);
-            (*srcLen) += processed;
-            src += processed;
-            inSize -= processed;
-        } else {
-            unsigned rem = p->tempBufSize, lookAhead = 0;
-            while (rem < LZMA_REQUIRED_INPUT_MAX && lookAhead < inSize)
-                p->tempBuf[rem++] = src[lookAhead++];
-            p->tempBufSize = rem;
-            if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow) {
-                int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);
-                if (dummyRes == DUMMY_ERROR) {
-                    (*srcLen) += lookAhead;
-                    *status = LZMA_STATUS_NEEDS_MORE_INPUT;
-                    return SZ_OK;
-                }
-                if (checkEndMarkNow && dummyRes != DUMMY_MATCH) {
-                    *status = LZMA_STATUS_NOT_FINISHED;
-                    return SZ_ERROR_DATA;
-                }
-            }
-            p->buf = p->tempBuf;
-            if (LzmaDec_DecodeReal2(p, dicLimit, p->buf) != 0)
-                return SZ_ERROR_DATA;
-            lookAhead -= (rem - (unsigned)(p->buf - p->tempBuf));
-            (*srcLen) += lookAhead;
-            src += lookAhead;
-            inSize -= lookAhead;
-            p->tempBufSize = 0;
-        }
-    }
-    if (p->code == 0)
-        *status = LZMA_STATUS_FINISHED_WITH_MARK;
-    return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA;
-}
-
-SRes LzmaDec_DecodeToBuf(CLzmaDec* p, Byte* dest, SizeT* destLen, const Byte* src, SizeT* srcLen, ELzmaFinishMode finishMode, ELzmaStatus* status)
-{
-    SizeT outSize = *destLen;
-    SizeT inSize = *srcLen;
-    *srcLen = *destLen = 0;
-    for (;;) {
-        SizeT inSizeCur = inSize, outSizeCur, dicPos;
-        ELzmaFinishMode curFinishMode;
-        SRes res;
-        if (p->dicPos == p->dicBufSize)
-            p->dicPos = 0;
-        dicPos = p->dicPos;
-        if (outSize > p->dicBufSize - dicPos) {
-            outSizeCur = p->dicBufSize;
-            curFinishMode = LZMA_FINISH_ANY;
-        } else {
-            outSizeCur = dicPos + outSize;
-            curFinishMode = finishMode;
-        }
-
-        res = LzmaDec_DecodeToDic(p, outSizeCur, src, &inSizeCur, curFinishMode, status);
-        src += inSizeCur;
-        inSize -= inSizeCur;
-        *srcLen += inSizeCur;
-        outSizeCur = p->dicPos - dicPos;
-        memcpy(dest, p->dic + dicPos, outSizeCur);
-        dest += outSizeCur;
-        outSize -= outSizeCur;
-        *destLen += outSizeCur;
-        if (res != 0)
-            return res;
-        if (outSizeCur == 0 || outSize == 0)
-            return SZ_OK;
-    }
-}
-
-void LzmaDec_FreeProbs(CLzmaDec* p, ISzAlloc* alloc)
-{
-    alloc->Free(alloc, p->probs);
-    p->probs = 0;
-}
-
-static void LzmaDec_FreeDict(CLzmaDec* p, ISzAlloc* alloc)
-{
-    alloc->Free(alloc, p->dic);
-    p->dic = 0;
-}
-
-void LzmaDec_Free(CLzmaDec* p, ISzAlloc* alloc)
-{
-    LzmaDec_FreeProbs(p, alloc);
-    LzmaDec_FreeDict(p, alloc);
-}
-
-SRes LzmaProps_Decode(CLzmaProps* p, const Byte* data, unsigned size)
-{
-    UInt32 dicSize;
-    Byte d;
-
-    if (size < LZMA_PROPS_SIZE)
-        return SZ_ERROR_UNSUPPORTED;
-    else
-        dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
-
-    if (dicSize < LZMA_DIC_MIN)
-        dicSize = LZMA_DIC_MIN;
-    p->dicSize = dicSize;
-
-    d = data[0];
-    if (d >= (9 * 5 * 5))
-        return SZ_ERROR_UNSUPPORTED;
-
-    p->lc = d % 9;
-    d /= 9;
-    p->pb = d / 5;
-    p->lp = d % 5;
-
-    return SZ_OK;
-}
-
-static SRes LzmaDec_AllocateProbs2(CLzmaDec* p, const CLzmaProps* propNew, ISzAlloc* alloc)
-{
-    UInt32 numProbs = LzmaProps_GetNumProbs(propNew);
-    if (p->probs == 0 || numProbs != p->numProbs) {
-        LzmaDec_FreeProbs(p, alloc);
-        p->probs = (CLzmaProb*)alloc->Alloc(alloc, numProbs * sizeof(CLzmaProb));
-        p->numProbs = numProbs;
-        if (p->probs == 0)
-            return SZ_ERROR_MEM;
-    }
-    return SZ_OK;
-}
-
-SRes LzmaDec_AllocateProbs(CLzmaDec* p, const Byte* props, unsigned propsSize, ISzAlloc* alloc)
-{
-    CLzmaProps propNew;
-    RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-    RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-    p->prop = propNew;
-    return SZ_OK;
-}
-
-SRes LzmaDec_Allocate(CLzmaDec* p, const Byte* props, unsigned propsSize, ISzAlloc* alloc)
-{
-    CLzmaProps propNew;
-    SizeT dicBufSize;
-    RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-    RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-    dicBufSize = propNew.dicSize;
-    if (p->dic == 0 || dicBufSize != p->dicBufSize) {
-        LzmaDec_FreeDict(p, alloc);
-        p->dic = (Byte*)alloc->Alloc(alloc, dicBufSize);
-        if (p->dic == 0) {
-            LzmaDec_FreeProbs(p, alloc);
-            return SZ_ERROR_MEM;
-        }
-    }
-    p->dicBufSize = dicBufSize;
-    p->prop = propNew;
-    return SZ_OK;
-}
-
-SRes LzmaDecode(Byte* dest, SizeT* destLen, const Byte* src, SizeT* srcLen,
-    const Byte* propData, unsigned propSize, ELzmaFinishMode finishMode,
-    ELzmaStatus* status, ISzAlloc* alloc)
-{
-    CLzmaDec p;
-    SRes res;
-    SizeT outSize = *destLen, inSize = *srcLen;
-    *destLen = *srcLen = 0;
-    *status = LZMA_STATUS_NOT_SPECIFIED;
-    if (inSize < RC_INIT_SIZE)
-        return SZ_ERROR_INPUT_EOF;
-    LzmaDec_Construct(&p);
-    RINOK(LzmaDec_AllocateProbs(&p, propData, propSize, alloc));
-    p.dic = dest;
-    p.dicBufSize = outSize;
-    LzmaDec_Init(&p);
-    *srcLen = inSize;
-    res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);
-    *destLen = p.dicPos;
-    if (res == SZ_OK && *status == LZMA_STATUS_NEEDS_MORE_INPUT)
-        res = SZ_ERROR_INPUT_EOF;
-    LzmaDec_FreeProbs(&p, alloc);
-    return res;
-}

fex/7z_C/Ppmd.h

@@ -1,93 +0,0 @@
-/* Ppmd.h -- PPMD codec common code
-2011-01-27 : Igor Pavlov : Public domain
-This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
-
-#ifndef __PPMD_H
-#define __PPMD_H
-
-#include "CpuArch.h"
-#include "Types.h"
-
-EXTERN_C_BEGIN
-
-#ifdef MY_CPU_32BIT
-#define PPMD_32BIT
-#endif
-
-#define PPMD_INT_BITS 7
-#define PPMD_PERIOD_BITS 7
-#define PPMD_BIN_SCALE (1 << (PPMD_INT_BITS + PPMD_PERIOD_BITS))
-
-#define PPMD_GET_MEAN_SPEC(summ, shift, round) (((summ) + (1 << ((shift) - (round)))) >> (shift))
-#define PPMD_GET_MEAN(summ) PPMD_GET_MEAN_SPEC((summ), PPMD_PERIOD_BITS, 2)
-#define PPMD_UPDATE_PROB_0(prob) ((prob) + (1 << PPMD_INT_BITS) - PPMD_GET_MEAN(prob))
-#define PPMD_UPDATE_PROB_1(prob) ((prob)-PPMD_GET_MEAN(prob))
-
-#define PPMD_N1 4
-#define PPMD_N2 4
-#define PPMD_N3 4
-#define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
-#define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
-
-#pragma pack(push, 1)
-/* Most compilers works OK here even without #pragma pack(push, 1), but some GCC compilers need it. */
-
-/* SEE-contexts for PPM-contexts with masked symbols */
-typedef struct
-{
-    UInt16 Summ; /* Freq */
-    Byte Shift; /* Speed of Freq change; low Shift is for fast change */
-    Byte Count; /* Count to next change of Shift */
-} CPpmd_See;
-
-#define Ppmd_See_Update(p)                                    \
-    if ((p)->Shift < PPMD_PERIOD_BITS && --(p)->Count == 0) { \
-        (p)->Summ <<= 1;                                      \
-        (p)->Count = (Byte)(3 << (p)->Shift++);               \
-    }
-
-typedef struct
-{
-    Byte Symbol;
-    Byte Freq;
-    UInt16 SuccessorLow;
-    UInt16 SuccessorHigh;
-} CPpmd_State;
-
-#pragma pack(pop)
-
-typedef
-#ifdef PPMD_32BIT
-    CPpmd_State*
-#else
-    UInt32
-#endif
-        CPpmd_State_Ref;
-
-typedef
-#ifdef PPMD_32BIT
-    void*
-#else
-    UInt32
-#endif
-        CPpmd_Void_Ref;
-
-typedef
-#ifdef PPMD_32BIT
-    Byte*
-#else
-    UInt32
-#endif
-        CPpmd_Byte_Ref;
-
-#define PPMD_SetAllBitsIn256Bytes(p)                                                                            \
-    {                                                                                                           \
-        unsigned i;                                                                                             \
-        for (i = 0; i < 256 / sizeof(p[0]); i += 8) {                                                           \
-            p[i + 7] = p[i + 6] = p[i + 5] = p[i + 4] = p[i + 3] = p[i + 2] = p[i + 1] = p[i + 0] = ~(size_t)0; \
-        }                                                                                                       \
-    }
-
-EXTERN_C_END
-
-#endif

fex/7z_C/Ppmd7.c

@@ -1,667 +0,0 @@
-/* Ppmd7.c -- PPMdH codec
-2010-03-12 : Igor Pavlov : Public domain
-This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
-
-#include <memory.h>
-
-#include "Ppmd7.h"
-
-const Byte PPMD7_kExpEscape[16] = { 25, 14, 9, 7, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2, 2 };
-static const UInt16 kInitBinEsc[] = { 0x3CDD, 0x1F3F, 0x59BF, 0x48F3, 0x64A1, 0x5ABC, 0x6632, 0x6051 };
-
-#define MAX_FREQ 124
-#define UNIT_SIZE 12
-
-#define U2B(nu) ((UInt32)(nu)*UNIT_SIZE)
-#define U2I(nu) (p->Units2Indx[(nu)-1])
-#define I2U(indx) (p->Indx2Units[indx])
-
-#ifdef PPMD_32BIT
-#define REF(ptr) (ptr)
-#else
-#define REF(ptr) ((UInt32)((Byte*)(ptr) - (p)->Base))
-#endif
-
-#define STATS_REF(ptr) ((CPpmd_State_Ref)REF(ptr))
-
-#define CTX(ref) ((CPpmd7_Context*)Ppmd7_GetContext(p, ref))
-#define STATS(ctx) Ppmd7_GetStats(p, ctx)
-#define ONE_STATE(ctx) Ppmd7Context_OneState(ctx)
-#define SUFFIX(ctx) CTX((ctx)->Suffix)
-
-typedef CPpmd7_Context* CTX_PTR;
-
-struct CPpmd7_Node_;
-
-typedef
-#ifdef PPMD_32BIT
-    struct CPpmd7_Node_*
-#else
-    UInt32
-#endif
-        CPpmd7_Node_Ref;
-
-typedef struct CPpmd7_Node_ {
-    UInt16 Stamp; /* must be at offset 0 as CPpmd7_Context::NumStats. Stamp=0 means free */
-    UInt16 NU;
-    CPpmd7_Node_Ref Next; /* must be at offset >= 4 */
-    CPpmd7_Node_Ref Prev;
-} CPpmd7_Node;
-
-#ifdef PPMD_32BIT
-#define NODE(ptr) (ptr)
-#else
-#define NODE(offs) ((CPpmd7_Node*)(p->Base + (offs)))
-#endif
-
-void Ppmd7_Construct(CPpmd7* p)
-{
-    unsigned i, k, m;
-
-    p->Base = 0;
-
-    for (i = 0, k = 0; i < PPMD_NUM_INDEXES; i++) {
-        unsigned step = (i >= 12 ? 4 : (i >> 2) + 1);
-        do {
-            p->Units2Indx[k++] = (Byte)i;
-        } while (--step);
-        p->Indx2Units[i] = (Byte)k;
-    }
-
-    p->NS2BSIndx[0] = (0 << 1);
-    p->NS2BSIndx[1] = (1 << 1);
-    memset(p->NS2BSIndx + 2, (2 << 1), 9);
-    memset(p->NS2BSIndx + 11, (3 << 1), 256 - 11);
-
-    for (i = 0; i < 3; i++)
-        p->NS2Indx[i] = (Byte)i;
-    for (m = i, k = 1; i < 256; i++) {
-        p->NS2Indx[i] = (Byte)m;
-        if (--k == 0)
-            k = (++m) - 2;
-    }
-
-    memset(p->HB2Flag, 0, 0x40);
-    memset(p->HB2Flag + 0x40, 8, 0x100 - 0x40);
-}
-
-void Ppmd7_Free(CPpmd7* p, ISzAlloc* alloc)
-{
-    alloc->Free(alloc, p->Base);
-    p->Size = 0;
-    p->Base = 0;
-}
-
-Bool Ppmd7_Alloc(CPpmd7* p, UInt32 size, ISzAlloc* alloc)
-{
-    if (p->Base == 0 || p->Size != size) {
-        Ppmd7_Free(p, alloc);
-        p->AlignOffset =
-#ifdef PPMD_32BIT
-            (4 - size) & 3;
-#else
-            4 - (size & 3);
-#endif
-        if ((p->Base = (Byte*)alloc->Alloc(alloc, p->AlignOffset + size
-#ifndef PPMD_32BIT
-                     + UNIT_SIZE
-#endif
-                 ))
-            == 0)
-            return False;
-        p->Size = size;
-    }
-    return True;
-}
-
-static void InsertNode(CPpmd7* p, void* node, unsigned indx)
-{
-    *((CPpmd_Void_Ref*)node) = p->FreeList[indx];
-    p->FreeList[indx] = REF(node);
-}
-
-static void* RemoveNode(CPpmd7* p, unsigned indx)
-{
-    CPpmd_Void_Ref* node = (CPpmd_Void_Ref*)Ppmd7_GetPtr(p, p->FreeList[indx]);
-    p->FreeList[indx] = *node;
-    return node;
-}
-
-static void SplitBlock(CPpmd7* p, void* ptr, unsigned oldIndx, unsigned newIndx)
-{
-    unsigned i, nu = I2U(oldIndx) - I2U(newIndx);
-    ptr = (Byte*)ptr + U2B(I2U(newIndx));
-    if (I2U(i = U2I(nu)) != nu) {
-        unsigned k = I2U(--i);
-        InsertNode(p, ((Byte*)ptr) + U2B(k), nu - k - 1);
-    }
-    InsertNode(p, ptr, i);
-}
-
-static void GlueFreeBlocks(CPpmd7* p)
-{
-#ifdef PPMD_32BIT
-    CPpmd7_Node headItem;
-    CPpmd7_Node_Ref head = &headItem;
-#else
-    CPpmd7_Node_Ref head = p->AlignOffset + p->Size;
-#endif
-
-    CPpmd7_Node_Ref n = head;
-    unsigned i;
-
-    p->GlueCount = 255;
-
-    /* create doubly-linked list of free blocks */
-    for (i = 0; i < PPMD_NUM_INDEXES; i++) {
-        UInt16 nu = I2U(i);
-        CPpmd7_Node_Ref next = (CPpmd7_Node_Ref)p->FreeList[i];
-        p->FreeList[i] = 0;
-        while (next != 0) {
-            CPpmd7_Node* node = NODE(next);
-            node->Next = n;
-            n = NODE(n)->Prev = next;
-            next = *(const CPpmd7_Node_Ref*)node;
-            node->Stamp = 0;
-            node->NU = (UInt16)nu;
-        }
-    }
-    NODE(head)
-        ->Stamp
-        = 1;
-    NODE(head)
-        ->Next
-        = n;
-    NODE(n)
-        ->Prev
-        = head;
-    if (p->LoUnit != p->HiUnit)
-        ((CPpmd7_Node*)p->LoUnit)->Stamp = 1;
-
-    /* Glue free blocks */
-    while (n != head) {
-        CPpmd7_Node* node = NODE(n);
-        UInt32 nu = (UInt32)node->NU;
-        for (;;) {
-            CPpmd7_Node* node2 = NODE(n) + nu;
-            nu += node2->NU;
-            if (node2->Stamp != 0 || nu >= 0x10000)
-                break;
-            NODE(node2->Prev)
-                ->Next
-                = node2->Next;
-            NODE(node2->Next)
-                ->Prev
-                = node2->Prev;
-            node->NU = (UInt16)nu;
-        }
-        n = node->Next;
-    }
-
-    /* Fill lists of free blocks */
-    for (n = NODE(head)->Next; n != head;) {
-        CPpmd7_Node* node = NODE(n);
-        unsigned nu;
-        CPpmd7_Node_Ref next = node->Next;
-        for (nu = node->NU; nu > 128; nu -= 128, node += 128)
-            InsertNode(p, node, PPMD_NUM_INDEXES - 1);
-        if (I2U(i = U2I(nu)) != nu) {
-            unsigned k = I2U(--i);
-            InsertNode(p, node + k, nu - k - 1);
-        }
-        InsertNode(p, node, i);
-        n = next;
-    }
-}
-
-static void* AllocUnitsRare(CPpmd7* p, unsigned indx)
-{
-    unsigned i;
-    void* retVal;
-    if (p->GlueCount == 0) {
-        GlueFreeBlocks(p);
-        if (p->FreeList[indx] != 0)
-            return RemoveNode(p, indx);
-    }
-    i = indx;
-    do {
-        if (++i == PPMD_NUM_INDEXES) {
-            UInt32 numBytes = U2B(I2U(indx));
-            p->GlueCount--;
-            return ((UInt32)(p->UnitsStart - p->Text) > numBytes) ? (p->UnitsStart -= numBytes) : (NULL);
-        }
-    } while (p->FreeList[i] == 0);
-    retVal = RemoveNode(p, i);
-    SplitBlock(p, retVal, i, indx);
-    return retVal;
-}
-
-static void* AllocUnits(CPpmd7* p, unsigned indx)
-{
-    UInt32 numBytes;
-    if (p->FreeList[indx] != 0)
-        return RemoveNode(p, indx);
-    numBytes = U2B(I2U(indx));
-    if (numBytes <= (UInt32)(p->HiUnit - p->LoUnit)) {
-        void* retVal = p->LoUnit;
-        p->LoUnit += numBytes;
-        return retVal;
-    }
-    return AllocUnitsRare(p, indx);
-}
-
-#define MyMem12Cpy(dest, src, num)            \
-    {                                         \
-        UInt32* d = (UInt32*)dest;            \
-        const UInt32* s = (const UInt32*)src; \
-        UInt32 n = num;                       \
-        do {                                  \
-            d[0] = s[0];                      \
-            d[1] = s[1];                      \
-            d[2] = s[2];                      \
-            s += 3;                           \
-            d += 3;                           \
-        } while (--n);                        \
-    }
-
-static void* ShrinkUnits(CPpmd7* p, void* oldPtr, unsigned oldNU, unsigned newNU)
-{
-    unsigned i0 = U2I(oldNU);
-    unsigned i1 = U2I(newNU);
-    if (i0 == i1)
-        return oldPtr;
-    if (p->FreeList[i1] != 0) {
-        void* ptr = RemoveNode(p, i1);
-        MyMem12Cpy(ptr, oldPtr, newNU);
-        InsertNode(p, oldPtr, i0);
-        return ptr;
-    }
-    SplitBlock(p, oldPtr, i0, i1);
-    return oldPtr;
-}
-
-#define SUCCESSOR(p) ((CPpmd_Void_Ref)((p)->SuccessorLow | ((UInt32)(p)->SuccessorHigh << 16)))
-
-static void SetSuccessor(CPpmd_State* p, CPpmd_Void_Ref v)
-{
-    (p)->SuccessorLow = (UInt16)((UInt32)(v)&0xFFFF);
-    (p)->SuccessorHigh = (UInt16)(((UInt32)(v) >> 16) & 0xFFFF);
-}
-
-static void RestartModel(CPpmd7* p)
-{
-    unsigned i, k, m;
-
-    memset(p->FreeList, 0, sizeof(p->FreeList));
-    p->Text = p->Base + p->AlignOffset;
-    p->HiUnit = p->Text + p->Size;
-    p->LoUnit = p->UnitsStart = p->HiUnit - p->Size / 8 / UNIT_SIZE * 7 * UNIT_SIZE;
-    p->GlueCount = 0;
-
-    p->OrderFall = p->MaxOrder;
-    p->RunLength = p->InitRL = -(Int32)((p->MaxOrder < 12) ? p->MaxOrder : 12) - 1;
-    p->PrevSuccess = 0;
-
-    p->MinContext = p->MaxContext = (CTX_PTR)(p->HiUnit -= UNIT_SIZE); /* AllocContext(p); */
-    p->MinContext->Suffix = 0;
-    p->MinContext->NumStats = 256;
-    p->MinContext->SummFreq = 256 + 1;
-    p->FoundState = (CPpmd_State*)p->LoUnit; /* AllocUnits(p, PPMD_NUM_INDEXES - 1); */
-    p->LoUnit += U2B(256 / 2);
-    p->MinContext->Stats = REF(p->FoundState);
-    for (i = 0; i < 256; i++) {
-        CPpmd_State* s = &p->FoundState[i];
-        s->Symbol = (Byte)i;
-        s->Freq = 1;
-        SetSuccessor(s, 0);
-    }
-
-    for (i = 0; i < 128; i++)
-        for (k = 0; k < 8; k++) {
-            UInt16* dest = p->BinSumm[i] + k;
-            UInt16 val = (UInt16)(PPMD_BIN_SCALE - kInitBinEsc[k] / (i + 2));
-            for (m = 0; m < 64; m += 8)
-                dest[m] = val;
-        }
-
-    for (i = 0; i < 25; i++)
-        for (k = 0; k < 16; k++) {
-            CPpmd_See* s = &p->See[i][k];
-            s->Summ = (UInt16)((5 * i + 10) << (s->Shift = PPMD_PERIOD_BITS - 4));
-            s->Count = 4;
-        }
-}
-
-void Ppmd7_Init(CPpmd7* p, unsigned maxOrder)
-{
-    p->MaxOrder = maxOrder;
-    RestartModel(p);
-    p->DummySee.Shift = PPMD_PERIOD_BITS;
-    p->DummySee.Summ = 0; /* unused */
-    p->DummySee.Count = 64; /* unused */
-}
-
-static CTX_PTR CreateSuccessors(CPpmd7* p, Bool skip)
-{
-    CPpmd_State upState;
-    CTX_PTR c = p->MinContext;
-    CPpmd_Byte_Ref upBranch = (CPpmd_Byte_Ref)SUCCESSOR(p->FoundState);
-    CPpmd_State* ps[PPMD7_MAX_ORDER];
-    unsigned numPs = 0;
-
-    if (!skip)
-        ps[numPs++] = p->FoundState;
-
-    while (c->Suffix) {
-        CPpmd_Void_Ref successor;
-        CPpmd_State* s;
-        c = SUFFIX(c);
-        if (c->NumStats != 1) {
-            for (s = STATS(c); s->Symbol != p->FoundState->Symbol; s++)
-                ;
-        } else
-            s = ONE_STATE(c);
-        successor = SUCCESSOR(s);
-        if (successor != upBranch) {
-            c = CTX(successor);
-            if (numPs == 0)
-                return c;
-            break;
-        }
-        ps[numPs++] = s;
-    }
-
-    upState.Symbol = *(const Byte*)Ppmd7_GetPtr(p, upBranch);
-    SetSuccessor(&upState, upBranch + 1);
-
-    if (c->NumStats == 1)
-        upState.Freq = ONE_STATE(c)->Freq;
-    else {
-        UInt32 cf, s0;
-        CPpmd_State* s;
-        for (s = STATS(c); s->Symbol != upState.Symbol; s++)
-            ;
-        cf = s->Freq - 1;
-        s0 = c->SummFreq - c->NumStats - cf;
-        upState.Freq = (Byte)(1 + ((2 * cf <= s0) ? (5 * cf > s0) : ((2 * cf + 3 * s0 - 1) / (2 * s0))));
-    }
-
-    do {
-        /* Create Child */
-        CTX_PTR c1; /* = AllocContext(p); */
-        if (p->HiUnit != p->LoUnit)
-            c1 = (CTX_PTR)(p->HiUnit -= UNIT_SIZE);
-        else if (p->FreeList[0] != 0)
-            c1 = (CTX_PTR)RemoveNode(p, 0);
-        else {
-            c1 = (CTX_PTR)AllocUnitsRare(p, 0);
-            if (!c1)
-                return NULL;
-        }
-        c1->NumStats = 1;
-        *ONE_STATE(c1) = upState;
-        c1->Suffix = REF(c);
-        SetSuccessor(ps[--numPs], REF(c1));
-        c = c1;
-    } while (numPs != 0);
-
-    return c;
-}
-
-static void SwapStates(CPpmd_State* t1, CPpmd_State* t2)
-{
-    CPpmd_State tmp = *t1;
-    *t1 = *t2;
-    *t2 = tmp;
-}
-
-static void UpdateModel(CPpmd7* p)
-{
-    CPpmd_Void_Ref successor, fSuccessor = SUCCESSOR(p->FoundState);
-    CTX_PTR c;
-    unsigned s0, ns;
-
-    if (p->FoundState->Freq < MAX_FREQ / 4 && p->MinContext->Suffix != 0) {
-        c = SUFFIX(p->MinContext);
-
-        if (c->NumStats == 1) {
-            CPpmd_State* s = ONE_STATE(c);
-            if (s->Freq < 32)
-                s->Freq++;
-        } else {
-            CPpmd_State* s = STATS(c);
-            if (s->Symbol != p->FoundState->Symbol) {
-                do {
-                    s++;
-                } while (s->Symbol != p->FoundState->Symbol);
-                if (s[0].Freq >= s[-1].Freq) {
-                    SwapStates(&s[0], &s[-1]);
-                    s--;
-                }
-            }
-            if (s->Freq < MAX_FREQ - 9) {
-                s->Freq += 2;
-                c->SummFreq += 2;
-            }
-        }
-    }
-
-    if (p->OrderFall == 0) {
-        p->MinContext = p->MaxContext = CreateSuccessors(p, True);
-        if (p->MinContext == 0) {
-            RestartModel(p);
-            return;
-        }
-        SetSuccessor(p->FoundState, REF(p->MinContext));
-        return;
-    }
-
-    *p->Text++ = p->FoundState->Symbol;
-    successor = REF(p->Text);
-    if (p->Text >= p->UnitsStart) {
-        RestartModel(p);
-        return;
-    }
-
-    if (fSuccessor) {
-        if (fSuccessor <= successor) {
-            CTX_PTR cs = CreateSuccessors(p, False);
-            if (cs == NULL) {
-                RestartModel(p);
-                return;
-            }
-            fSuccessor = REF(cs);
-        }
-        if (--p->OrderFall == 0) {
-            successor = fSuccessor;
-            p->Text -= (p->MaxContext != p->MinContext);
-        }
-    } else {
-        SetSuccessor(p->FoundState, successor);
-        fSuccessor = REF(p->MinContext);
-    }
-
-    s0 = p->MinContext->SummFreq - (ns = p->MinContext->NumStats) - (p->FoundState->Freq - 1);
-
-    for (c = p->MaxContext; c != p->MinContext; c = SUFFIX(c)) {
-        unsigned ns1;
-        UInt32 cf, sf;
-        if ((ns1 = c->NumStats) != 1) {
-            if ((ns1 & 1) == 0) {
-                /* Expand for one UNIT */
-                unsigned oldNU = ns1 >> 1;
-                unsigned i = U2I(oldNU);
-                if (i != U2I(oldNU + 1)) {
-                    void* ptr = AllocUnits(p, i + 1);
-                    void* oldPtr;
-                    if (!ptr) {
-                        RestartModel(p);
-                        return;
-                    }
-                    oldPtr = STATS(c);
-                    MyMem12Cpy(ptr, oldPtr, oldNU);
-                    InsertNode(p, oldPtr, i);
-                    c->Stats = STATS_REF(ptr);
-                }
-            }
-            c->SummFreq = (UInt16)(c->SummFreq + (2 * ns1 < ns) + 2 * ((4 * ns1 <= ns) & (c->SummFreq <= 8 * ns1)));
-        } else {
-            CPpmd_State* s = (CPpmd_State*)AllocUnits(p, 0);
-            if (!s) {
-                RestartModel(p);
-                return;
-            }
-            *s = *ONE_STATE(c);
-            c->Stats = REF(s);
-            if (s->Freq < MAX_FREQ / 4 - 1)
-                s->Freq <<= 1;
-            else
-                s->Freq = MAX_FREQ - 4;
-            c->SummFreq = (UInt16)(s->Freq + p->InitEsc + (ns > 3));
-        }
-        cf = 2 * (UInt32)p->FoundState->Freq * (c->SummFreq + 6);
-        sf = (UInt32)s0 + c->SummFreq;
-        if (cf < 6 * sf) {
-            cf = 1 + (cf > sf) + (cf >= 4 * sf);
-            c->SummFreq += 3;
-        } else {
-            cf = 4 + (cf >= 9 * sf) + (cf >= 12 * sf) + (cf >= 15 * sf);
-            c->SummFreq = (UInt16)(c->SummFreq + cf);
-        }
-        {
-            CPpmd_State* s = STATS(c) + ns1;
-            SetSuccessor(s, successor);
-            s->Symbol = p->FoundState->Symbol;
-            s->Freq = (Byte)cf;
-            c->NumStats = (UInt16)(ns1 + 1);
-        }
-    }
-    p->MaxContext = p->MinContext = CTX(fSuccessor);
-}
-
-static void Rescale(CPpmd7* p)
-{
-    unsigned i, adder, sumFreq, escFreq;
-    CPpmd_State* stats = STATS(p->MinContext);
-    CPpmd_State* s = p->FoundState;
-    {
-        CPpmd_State tmp = *s;
-        for (; s != stats; s--)
-            s[0] = s[-1];
-        *s = tmp;
-    }
-    escFreq = p->MinContext->SummFreq - s->Freq;
-    s->Freq += 4;
-    adder = (p->OrderFall != 0);
-    s->Freq = (Byte)((s->Freq + adder) >> 1);
-    sumFreq = s->Freq;
-
-    i = p->MinContext->NumStats - 1;
-    do {
-        escFreq -= (++s)->Freq;
-        s->Freq = (Byte)((s->Freq + adder) >> 1);
-        sumFreq += s->Freq;
-        if (s[0].Freq > s[-1].Freq) {
-            CPpmd_State* s1 = s;
-            CPpmd_State tmp = *s1;
-            do
-                s1[0] = s1[-1];
-            while (--s1 != stats && tmp.Freq > s1[-1].Freq);
-            *s1 = tmp;
-        }
-    } while (--i);
-
-    if (s->Freq == 0) {
-        unsigned numStats = p->MinContext->NumStats;
-        unsigned n0, n1;
-        do {
-            i++;
-        } while ((--s)->Freq == 0);
-        escFreq += i;
-        p->MinContext->NumStats = (UInt16)(p->MinContext->NumStats - i);
-        if (p->MinContext->NumStats == 1) {
-            CPpmd_State tmp = *stats;
-            do {
-                tmp.Freq = (Byte)(tmp.Freq - (tmp.Freq >> 1));
-                escFreq >>= 1;
-            } while (escFreq > 1);
-            InsertNode(p, stats, U2I(((numStats + 1) >> 1)));
-            *(p->FoundState = ONE_STATE(p->MinContext)) = tmp;
-            return;
-        }
-        n0 = (numStats + 1) >> 1;
-        n1 = (p->MinContext->NumStats + 1) >> 1;
-        if (n0 != n1)
-            p->MinContext->Stats = STATS_REF(ShrinkUnits(p, stats, n0, n1));
-    }
-    p->MinContext->SummFreq = (UInt16)(sumFreq + escFreq - (escFreq >> 1));
-    p->FoundState = STATS(p->MinContext);
-}
-
-CPpmd_See* Ppmd7_MakeEscFreq(CPpmd7* p, unsigned numMasked, UInt32* escFreq)
-{
-    CPpmd_See* see;
-    unsigned nonMasked = p->MinContext->NumStats - numMasked;
-    if (p->MinContext->NumStats != 256) {
-        see = p->See[p->NS2Indx[nonMasked - 1]] + (nonMasked < (unsigned)SUFFIX(p->MinContext)->NumStats - p->MinContext->NumStats) + 2 * (p->MinContext->SummFreq < 11 * p->MinContext->NumStats) + 4 * (numMasked > nonMasked) + p->HiBitsFlag;
-        {
-            unsigned r = (see->Summ >> see->Shift);
-            see->Summ = (UInt16)(see->Summ - r);
-            *escFreq = r + (r == 0);
-        }
-    } else {
-        see = &p->DummySee;
-        *escFreq = 1;
-    }
-    return see;
-}
-
-static void NextContext(CPpmd7* p)
-{
-    CTX_PTR c = CTX(SUCCESSOR(p->FoundState));
-    if (p->OrderFall == 0 && (Byte*)c > p->Text)
-        p->MinContext = p->MaxContext = c;
-    else
-        UpdateModel(p);
-}
-
-void Ppmd7_Update1(CPpmd7* p)
-{
-    CPpmd_State* s = p->FoundState;
-    s->Freq += 4;
-    p->MinContext->SummFreq += 4;
-    if (s[0].Freq > s[-1].Freq) {
-        SwapStates(&s[0], &s[-1]);
-        p->FoundState = --s;
-        if (s->Freq > MAX_FREQ)
-            Rescale(p);
-    }
-    NextContext(p);
-}
-
-void Ppmd7_Update1_0(CPpmd7* p)
-{
-    p->PrevSuccess = (2 * p->FoundState->Freq > p->MinContext->SummFreq);
-    p->RunLength += p->PrevSuccess;
-    p->MinContext->SummFreq += 4;
-    if ((p->FoundState->Freq += 4) > MAX_FREQ)
-        Rescale(p);
-    NextContext(p);
-}
-
-void Ppmd7_UpdateBin(CPpmd7* p)
-{
-    p->FoundState->Freq = (Byte)(p->FoundState->Freq + (p->FoundState->Freq < 128 ? 1 : 0));
-    p->PrevSuccess = 1;
-    p->RunLength++;
-    NextContext(p);
-}
-
-void Ppmd7_Update2(CPpmd7* p)
-{
-    p->MinContext->SummFreq += 4;
-    if ((p->FoundState->Freq += 4) > MAX_FREQ)
-        Rescale(p);
-    p->RunLength = p->InitRL;
-    UpdateModel(p);
-}

fex/7z_C/Ppmd7.h

@@ -1,132 +0,0 @@
-/* Ppmd7.h -- PPMdH compression codec
-2010-03-12 : Igor Pavlov : Public domain
-This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
-
-/* This code supports virtual RangeDecoder and includes the implementation
-of RangeCoder from 7z, instead of RangeCoder from original PPMd var.H.
-If you need the compatibility with original PPMd var.H, you can use external RangeDecoder */
-
-#ifndef __PPMD7_H
-#define __PPMD7_H
-
-#include "Ppmd.h"
-
-EXTERN_C_BEGIN
-
-#define PPMD7_MIN_ORDER 2
-#define PPMD7_MAX_ORDER 64
-
-#define PPMD7_MIN_MEM_SIZE (1 << 11)
-#define PPMD7_MAX_MEM_SIZE (0xFFFFFFFF - 12 * 3)
-
-struct CPpmd7_Context_;
-
-typedef
-#ifdef PPMD_32BIT
-    struct CPpmd7_Context_*
-#else
-    UInt32
-#endif
-        CPpmd7_Context_Ref;
-
-typedef struct CPpmd7_Context_ {
-    UInt16 NumStats;
-    UInt16 SummFreq;
-    CPpmd_State_Ref Stats;
-    CPpmd7_Context_Ref Suffix;
-} CPpmd7_Context;
-
-#define Ppmd7Context_OneState(p) ((CPpmd_State*)&(p)->SummFreq)
-
-typedef struct
-{
-    CPpmd7_Context *MinContext, *MaxContext;
-    CPpmd_State* FoundState;
-    unsigned OrderFall, InitEsc, PrevSuccess, MaxOrder, HiBitsFlag;
-    Int32 RunLength, InitRL; /* must be 32-bit at least */
-
-    UInt32 Size;
-    UInt32 GlueCount;
-    Byte *Base, *LoUnit, *HiUnit, *Text, *UnitsStart;
-    UInt32 AlignOffset;
-
-    Byte Indx2Units[PPMD_NUM_INDEXES];
-    Byte Units2Indx[128];
-    CPpmd_Void_Ref FreeList[PPMD_NUM_INDEXES];
-    Byte NS2Indx[256], NS2BSIndx[256], HB2Flag[256];
-    CPpmd_See DummySee, See[25][16];
-    UInt16 BinSumm[128][64];
-} CPpmd7;
-
-void Ppmd7_Construct(CPpmd7* p);
-Bool Ppmd7_Alloc(CPpmd7* p, UInt32 size, ISzAlloc* alloc);
-void Ppmd7_Free(CPpmd7* p, ISzAlloc* alloc);
-void Ppmd7_Init(CPpmd7* p, unsigned maxOrder);
-#define Ppmd7_WasAllocated(p) ((p)->Base != NULL)
-
-/* ---------- Internal Functions ---------- */
-
-extern const Byte PPMD7_kExpEscape[16];
-
-#ifdef PPMD_32BIT
-#define Ppmd7_GetPtr(p, ptr) (ptr)
-#define Ppmd7_GetContext(p, ptr) (ptr)
-#define Ppmd7_GetStats(p, ctx) ((ctx)->Stats)
-#else
-#define Ppmd7_GetPtr(p, offs) ((void*)((p)->Base + (offs)))
-#define Ppmd7_GetContext(p, offs) ((CPpmd7_Context*)Ppmd7_GetPtr((p), (offs)))
-#define Ppmd7_GetStats(p, ctx) ((CPpmd_State*)Ppmd7_GetPtr((p), ((ctx)->Stats)))
-#endif
-
-void Ppmd7_Update1(CPpmd7* p);
-void Ppmd7_Update1_0(CPpmd7* p);
-void Ppmd7_Update2(CPpmd7* p);
-void Ppmd7_UpdateBin(CPpmd7* p);
-
-#define Ppmd7_GetBinSumm(p) \
-    &p->BinSumm[Ppmd7Context_OneState(p->MinContext)->Freq - 1][p->PrevSuccess + p->NS2BSIndx[Ppmd7_GetContext(p, p->MinContext->Suffix)->NumStats - 1] + (p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol]) + 2 * p->HB2Flag[Ppmd7Context_OneState(p->MinContext)->Symbol] + ((p->RunLength >> 26) & 0x20)]
-
-CPpmd_See* Ppmd7_MakeEscFreq(CPpmd7* p, unsigned numMasked, UInt32* scale);
-
-/* ---------- Decode ---------- */
-
-typedef struct
-{
-    UInt32 (*GetThreshold)(void* p, UInt32 total);
-    void (*Decode)(void* p, UInt32 start, UInt32 size);
-    UInt32 (*DecodeBit)(void* p, UInt32 size0);
-} IPpmd7_RangeDec;
-
-typedef struct
-{
-    IPpmd7_RangeDec p;
-    UInt32 Range;
-    UInt32 Code;
-    IByteIn* Stream;
-} CPpmd7z_RangeDec;
-
-void Ppmd7z_RangeDec_CreateVTable(CPpmd7z_RangeDec* p);
-Bool Ppmd7z_RangeDec_Init(CPpmd7z_RangeDec* p);
-#define Ppmd7z_RangeDec_IsFinishedOK(p) ((p)->Code == 0)
-
-int Ppmd7_DecodeSymbol(CPpmd7* p, IPpmd7_RangeDec* rc);
-
-/* ---------- Encode ---------- */
-
-typedef struct
-{
-    UInt64 Low;
-    UInt32 Range;
-    Byte Cache;
-    UInt64 CacheSize;
-    IByteOut* Stream;
-} CPpmd7z_RangeEnc;
-
-void Ppmd7z_RangeEnc_Init(CPpmd7z_RangeEnc* p);
-void Ppmd7z_RangeEnc_FlushData(CPpmd7z_RangeEnc* p);
-
-void Ppmd7_EncodeSymbol(CPpmd7* p, CPpmd7z_RangeEnc* rc, int symbol);
-
-EXTERN_C_END
-
-#endif

fex/7z_C/Ppmd7Dec.c

@@ -1,172 +0,0 @@
-/* Ppmd7Dec.c -- PPMdH Decoder
-2010-03-12 : Igor Pavlov : Public domain
-This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
-
-#include "Ppmd7.h"
-
-#define kTopValue (1 << 24)
-
-Bool Ppmd7z_RangeDec_Init(CPpmd7z_RangeDec* p)
-{
-    unsigned i;
-    p->Code = 0;
-    p->Range = 0xFFFFFFFF;
-    if (p->Stream->Read((void*)p->Stream) != 0)
-        return False;
-    for (i = 0; i < 4; i++)
-        p->Code = (p->Code << 8) | p->Stream->Read((void*)p->Stream);
-    return (p->Code < 0xFFFFFFFF);
-}
-
-static UInt32 Range_GetThreshold(void* pp, UInt32 total)
-{
-    CPpmd7z_RangeDec* p = (CPpmd7z_RangeDec*)pp;
-    return (p->Code) / (p->Range /= total);
-}
-
-static void Range_Normalize(CPpmd7z_RangeDec* p)
-{
-    if (p->Range < kTopValue) {
-        p->Code = (p->Code << 8) | p->Stream->Read((void*)p->Stream);
-        p->Range <<= 8;
-        if (p->Range < kTopValue) {
-            p->Code = (p->Code << 8) | p->Stream->Read((void*)p->Stream);
-            p->Range <<= 8;
-        }
-    }
-}
-
-static void Range_Decode(void* pp, UInt32 start, UInt32 size)
-{
-    CPpmd7z_RangeDec* p = (CPpmd7z_RangeDec*)pp;
-    p->Code -= start * p->Range;
-    p->Range *= size;
-    Range_Normalize(p);
-}
-
-static UInt32 Range_DecodeBit(void* pp, UInt32 size0)
-{
-    CPpmd7z_RangeDec* p = (CPpmd7z_RangeDec*)pp;
-    UInt32 newBound = (p->Range >> 14) * size0;
-    UInt32 symbol;
-    if (p->Code < newBound) {
-        symbol = 0;
-        p->Range = newBound;
-    } else {
-        symbol = 1;
-        p->Code -= newBound;
-        p->Range -= newBound;
-    }
-    Range_Normalize(p);
-    return symbol;
-}
-
-void Ppmd7z_RangeDec_CreateVTable(CPpmd7z_RangeDec* p)
-{
-    p->p.GetThreshold = Range_GetThreshold;
-    p->p.Decode = Range_Decode;
-    p->p.DecodeBit = Range_DecodeBit;
-}
-
-#define MASK(sym) ((signed char*)charMask)[sym]
-
-int Ppmd7_DecodeSymbol(CPpmd7* p, IPpmd7_RangeDec* rc)
-{
-    size_t charMask[256 / sizeof(size_t)];
-    if (p->MinContext->NumStats != 1) {
-        CPpmd_State* s = Ppmd7_GetStats(p, p->MinContext);
-        unsigned i;
-        UInt32 count, hiCnt;
-        if ((count = rc->GetThreshold(rc, p->MinContext->SummFreq)) < (hiCnt = s->Freq)) {
-            Byte symbol;
-            rc->Decode(rc, 0, s->Freq);
-            p->FoundState = s;
-            symbol = s->Symbol;
-            Ppmd7_Update1_0(p);
-            return symbol;
-        }
-        p->PrevSuccess = 0;
-        i = p->MinContext->NumStats - 1;
-        do {
-            if ((hiCnt += (++s)->Freq) > count) {
-                Byte symbol;
-                rc->Decode(rc, hiCnt - s->Freq, s->Freq);
-                p->FoundState = s;
-                symbol = s->Symbol;
-                Ppmd7_Update1(p);
-                return symbol;
-            }
-        } while (--i);
-        if (count >= p->MinContext->SummFreq)
-            return -2;
-        p->HiBitsFlag = p->HB2Flag[p->FoundState->Symbol];
-        rc->Decode(rc, hiCnt, p->MinContext->SummFreq - hiCnt);
-        PPMD_SetAllBitsIn256Bytes(charMask);
-        MASK(s->Symbol) = 0;
-        i = p->MinContext->NumStats - 1;
-        do {
-            MASK((--s)->Symbol) = 0;
-        } while (--i);
-    } else {
-        UInt16* prob = Ppmd7_GetBinSumm(p);
-        if (rc->DecodeBit(rc, *prob) == 0) {
-            Byte symbol;
-            *prob = (UInt16)PPMD_UPDATE_PROB_0(*prob);
-            symbol = (p->FoundState = Ppmd7Context_OneState(p->MinContext))->Symbol;
-            Ppmd7_UpdateBin(p);
-            return symbol;
-        }
-        *prob = (UInt16)PPMD_UPDATE_PROB_1(*prob);
-        p->InitEsc = PPMD7_kExpEscape[*prob >> 10];
-        PPMD_SetAllBitsIn256Bytes(charMask);
-        MASK(Ppmd7Context_OneState(p->MinContext)->Symbol) = 0;
-        p->PrevSuccess = 0;
-    }
-    for (;;) {
-        CPpmd_State *ps[256], *s;
-        UInt32 freqSum, count, hiCnt;
-        CPpmd_See* see;
-        unsigned i, num, numMasked = p->MinContext->NumStats;
-        do {
-            p->OrderFall++;
-            if (!p->MinContext->Suffix)
-                return -1;
-            p->MinContext = Ppmd7_GetContext(p, p->MinContext->Suffix);
-        } while (p->MinContext->NumStats == numMasked);
-        hiCnt = 0;
-        s = Ppmd7_GetStats(p, p->MinContext);
-        i = 0;
-        num = p->MinContext->NumStats - numMasked;
-        do {
-            int k = (int)(MASK(s->Symbol));
-            hiCnt += (s->Freq & k);
-            ps[i] = s++;
-            i -= k;
-        } while (i != num);
-
-        see = Ppmd7_MakeEscFreq(p, numMasked, &freqSum);
-        freqSum += hiCnt;
-        count = rc->GetThreshold(rc, freqSum);
-
-        if (count < hiCnt) {
-            Byte symbol;
-            CPpmd_State** pps = ps;
-            for (hiCnt = 0; (hiCnt += (*pps)->Freq) <= count; pps++)
-                ;
-            s = *pps;
-            rc->Decode(rc, hiCnt - s->Freq, s->Freq);
-            Ppmd_See_Update(see);
-            p->FoundState = s;
-            symbol = s->Symbol;
-            Ppmd7_Update2(p);
-            return symbol;
-        }
-        if (count >= freqSum)
-            return -2;
-        rc->Decode(rc, hiCnt, freqSum - hiCnt);
-        see->Summ = (UInt16)(see->Summ + freqSum);
-        do {
-            MASK(ps[--i]->Symbol) = 0;
-        } while (i != 0);
-    }
-}

fex/7z_C/Types.h

@@ -1,256 +0,0 @@
-/* Types.h -- Basic types
-2010-10-09 : Igor Pavlov : Public domain */
-
-#ifndef __7Z_TYPES_H
-#define __7Z_TYPES_H
-
-#include <stddef.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#ifndef EXTERN_C_BEGIN
-#ifdef __cplusplus
-#define EXTERN_C_BEGIN extern "C" {
-#define EXTERN_C_END }
-#else
-#define EXTERN_C_BEGIN
-#define EXTERN_C_END
-#endif
-#endif
-
-EXTERN_C_BEGIN
-
-#define SZ_OK 0
-
-#define SZ_ERROR_DATA 1
-#define SZ_ERROR_MEM 2
-#define SZ_ERROR_CRC 3
-#define SZ_ERROR_UNSUPPORTED 4
-#define SZ_ERROR_PARAM 5
-#define SZ_ERROR_INPUT_EOF 6
-#define SZ_ERROR_OUTPUT_EOF 7
-#define SZ_ERROR_READ 8
-#define SZ_ERROR_WRITE 9
-#define SZ_ERROR_PROGRESS 10
-#define SZ_ERROR_FAIL 11
-#define SZ_ERROR_THREAD 12
-
-#define SZ_ERROR_ARCHIVE 16
-#define SZ_ERROR_NO_ARCHIVE 17
-
-typedef int SRes;
-
-#ifdef _WIN32
-typedef DWORD WRes;
-#else
-typedef int WRes;
-#endif
-
-#ifndef RINOK
-#define RINOK(x)               \
-    {                          \
-        int __result__ = (x);  \
-        if (__result__ != 0)   \
-            return __result__; \
-    }
-#endif
-
-typedef unsigned char Byte;
-typedef short Int16;
-typedef unsigned short UInt16;
-
-#ifdef _LZMA_UINT32_IS_ULONG
-typedef long Int32;
-typedef unsigned long UInt32;
-#else
-typedef int Int32;
-typedef unsigned int UInt32;
-#endif
-
-#ifdef _SZ_NO_INT_64
-
-/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
-   NOTES: Some code will work incorrectly in that case! */
-
-typedef long Int64;
-typedef unsigned long UInt64;
-
-#else
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef __int64 Int64;
-typedef unsigned __int64 UInt64;
-#define UINT64_CONST(n) n
-#else
-typedef long long int Int64;
-typedef unsigned long long int UInt64;
-#define UINT64_CONST(n) n##ULL
-#endif
-
-#endif
-
-#ifdef _LZMA_NO_SYSTEM_SIZE_T
-typedef UInt32 SizeT;
-#else
-typedef size_t SizeT;
-#endif
-
-typedef int Bool;
-#define True 1
-#define False 0
-
-#ifdef _WIN32
-#define MY_STD_CALL __stdcall
-#else
-#define MY_STD_CALL
-#endif
-
-#ifdef _MSC_VER
-
-#if _MSC_VER >= 1300
-#define MY_NO_INLINE __declspec(noinline)
-#else
-#define MY_NO_INLINE
-#endif
-
-#define MY_CDECL __cdecl
-#define MY_FAST_CALL __fastcall
-
-#else
-
-#define MY_CDECL
-#define MY_FAST_CALL
-
-#endif
-
-/* The following interfaces use first parameter as pointer to structure */
-
-typedef struct
-{
-    Byte (*Read)(void* p); /* reads one byte, returns 0 in case of EOF or error */
-} IByteIn;
-
-typedef struct
-{
-    void (*Write)(void* p, Byte b);
-} IByteOut;
-
-typedef struct
-{
-    SRes (*Read)(void* p, void* buf, size_t* size);
-    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-       (output(*size) < input(*size)) is allowed */
-} ISeqInStream;
-
-/* it can return SZ_ERROR_INPUT_EOF */
-SRes SeqInStream_Read(ISeqInStream* stream, void* buf, size_t size);
-SRes SeqInStream_Read2(ISeqInStream* stream, void* buf, size_t size, SRes errorType);
-SRes SeqInStream_ReadByte(ISeqInStream* stream, Byte* buf);
-
-typedef struct
-{
-    size_t (*Write)(void* p, const void* buf, size_t size);
-    /* Returns: result - the number of actually written bytes.
-       (result < size) means error */
-} ISeqOutStream;
-
-typedef enum {
-    SZ_SEEK_SET = 0,
-    SZ_SEEK_CUR = 1,
-    SZ_SEEK_END = 2
-} ESzSeek;
-
-typedef struct
-{
-    SRes (*Read)(void* p, void* buf, size_t* size); /* same as ISeqInStream::Read */
-    SRes (*Seek)(void* p, Int64* pos, ESzSeek origin);
-} ISeekInStream;
-
-typedef struct
-{
-    SRes (*Look)(void* p, const void** buf, size_t* size);
-    /* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
-       (output(*size) > input(*size)) is not allowed
-       (output(*size) < input(*size)) is allowed */
-    SRes (*Skip)(void* p, size_t offset);
-    /* offset must be <= output(*size) of Look */
-
-    SRes (*Read)(void* p, void* buf, size_t* size);
-    /* reads directly (without buffer). It's same as ISeqInStream::Read */
-    SRes (*Seek)(void* p, Int64* pos, ESzSeek origin);
-} ILookInStream;
-
-SRes LookInStream_LookRead(ILookInStream* stream, void* buf, size_t* size);
-SRes LookInStream_SeekTo(ILookInStream* stream, UInt64 offset);
-
-/* reads via ILookInStream::Read */
-SRes LookInStream_Read2(ILookInStream* stream, void* buf, size_t size, SRes errorType);
-SRes LookInStream_Read(ILookInStream* stream, void* buf, size_t size);
-
-#define LookToRead_BUF_SIZE (1 << 14)
-
-typedef struct
-{
-    ILookInStream s;
-    ISeekInStream* realStream;
-    size_t pos;
-    size_t size;
-    Byte buf[LookToRead_BUF_SIZE];
-} CLookToRead;
-
-void LookToRead_CreateVTable(CLookToRead* p, int lookahead);
-void LookToRead_Init(CLookToRead* p);
-
-typedef struct
-{
-    ISeqInStream s;
-    ILookInStream* realStream;
-} CSecToLook;
-
-void SecToLook_CreateVTable(CSecToLook* p);
-
-typedef struct
-{
-    ISeqInStream s;
-    ILookInStream* realStream;
-} CSecToRead;
-
-void SecToRead_CreateVTable(CSecToRead* p);
-
-typedef struct
-{
-    SRes (*Progress)(void* p, UInt64 inSize, UInt64 outSize);
-    /* Returns: result. (result != SZ_OK) means break.
-       Value (UInt64)(Int64)-1 for size means unknown value. */
-} ICompressProgress;
-
-typedef struct
-{
-    void* (*Alloc)(void* p, size_t size);
-    void (*Free)(void* p, void* address); /* address can be 0 */
-} ISzAlloc;
-
-#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
-#define IAlloc_Free(p, a) (p)->Free((p), a)
-
-#ifdef _WIN32
-
-#define CHAR_PATH_SEPARATOR '\\'
-#define WCHAR_PATH_SEPARATOR L'\\'
-#define STRING_PATH_SEPARATOR "\\"
-#define WSTRING_PATH_SEPARATOR L"\\"
-
-#else
-
-#define CHAR_PATH_SEPARATOR '/'
-#define WCHAR_PATH_SEPARATOR L'/'
-#define STRING_PATH_SEPARATOR "/"
-#define WSTRING_PATH_SEPARATOR L"/"
-
-#endif
-
-EXTERN_C_END
-
-#endif

fex/CMakeLists.txt

@@ -1,46 +0,0 @@
-#Do not use this file directly.  Always use the top level CMakeLists.txt file
-#File extractors so the user doesn't have to extract the rom before playing it
-
-# Source files definition
-SET(SRC_FEX
-    7z_C/7zAlloc.c
-    7z_C/7zBuf.c
-    7z_C/7zCrc.c
-    7z_C/7zCrcOpt.c
-    7z_C/7zDec.c
-    7z_C/7zIn.c
-    7z_C/7zStream.c
-    7z_C/Bcj2.c
-    7z_C/Bra86.c
-    7z_C/Bra.c
-    7z_C/CpuArch.c
-    7z_C/Lzma2Dec.c
-    7z_C/LzmaDec.c
-    7z_C/Ppmd7.c
-    7z_C/Ppmd7Dec.c
-    fex/Binary_Extractor.cpp
-    fex/blargg_common.cpp
-    fex/blargg_errors.cpp
-    fex/Data_Reader.cpp
-    fex/fex.cpp
-    fex/File_Extractor.cpp
-    fex/Gzip_Extractor.cpp
-    fex/Gzip_Reader.cpp
-    fex/Rar_Extractor.cpp
-    fex/Zip7_Extractor.cpp
-    fex/Zip_Extractor.cpp
-    fex/Zlib_Inflater.cpp
-)
-
-INCLUDE_DIRECTORIES(
-    .
-    ${ZLIB_INCLUDE_DIRS}
-)
-
-ADD_LIBRARY(
-    fex
-    STATIC
-    ${SRC_FEX}
-)
-
-add_dependencies(fex generate)

installdeps

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 CMAKE=cmake
-ENABLE_OPENAL=1
 ENABLE_FFMPEG=1
 
 main() {
@@ -25,10 +24,6 @@ check_command_line_args() {
                 usage
                 quit 0
                 ;;
-            --no-openal)
-                ENABLE_OPENAL=
-                shift
-                ;;
             --no-ffmpeg)
                 ENABLE_FFMPEG=
                 shift
@@ -196,7 +191,7 @@ freebsd_installdeps() {
 
     check sudo pkg update
 
-    pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl2 sfml wx31-gtk3 iconv zip ninja"
+    pkgs="llvm-devel cmake ccache nasm ffmpeg gettext-tools gettext pkgconf sdl3 wx31-gtk3 iconv zip ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 
@@ -323,16 +318,8 @@ 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)
-
         # not present in trusty
         if [ -n "$ENABLE_FFMPEG" ]; then
             libswresample_dev=$(apt-cache search libswresample-dev | awk '{print $1}')
@@ -355,9 +342,8 @@ 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 libsfml-dev $sfml_libs $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build"
+        pkgs="build-essential g++ nasm cmake ccache gettext zlib1g-dev libgl1-mesa-dev libgettextpo-dev libsdl3-dev libglu1-mesa-dev libglu1-mesa libgles2-mesa-dev $glew_lib $wx_libs libgtk2.0-dev libgtk-3-dev ccache zip ninja-build libopenal-dev"
 
-        [ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs libopenal-dev"
         [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs libavcodec-dev libavformat-dev libswscale-dev libavutil-dev $libswresample_dev"
 
         check sudo apt-get -qy install $pkgs
@@ -407,8 +393,7 @@ debian_installdeps() {
             fi
         fi
 
-        deps="gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets"
-        [ -n "$ENABLE_OPENAL" ] && deps="$deps openal"
+        deps="gcc zlib ffmpeg gettext sdl3 openal wxwidgets openal"
         [ -n "$ENABLE_FFMPEG" ] && deps="$deps ffmpeg"
 
         set --
@@ -505,14 +490,11 @@ 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 SFML-devel openal-soft-devel wxGTK-devel gtk3-devel; do
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK-devel gtk3-devel; do
             case $pkg in
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
                     ;;
-                *openal*)
-                    [ -z "$ENABLE_OPENAL" ] && continue
-                    ;;
             esac
 
             pkg_arch=
@@ -601,20 +583,12 @@ fedora_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets3; do
+        for pkg in zlib gettext SDL3 wxWidgets3 openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
-        # install deps that are not available as static
-        if [ -n "$ENABLE_OPENAL" ]; then
-            for pkg in openal-soft; do
-                set -- "$@" "${target}-${pkg}"
-            done
-        fi
 
         # 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 "$@"
@@ -700,16 +674,11 @@ 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
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel SDL3-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
             case $pkg in
                 *ffmpeg*)
                     [ -z "$ENABLE_FFMPEG" ] && continue
                     ;;
-                *openal*)
-                    [ -z "$ENABLE_OPENAL" ] && continue
-                    ;;
             esac
 
             if [ -n "$amd64" ]; then
@@ -790,20 +759,12 @@ rhel_installdeps() {
                 ;;
         esac
         # install static deps
-        for pkg in zlib gettext SDL2 wxWidgets; do
+        for pkg in zlib gettext SDL3 wxWidgets openal-soft; do
             set -- "$@" "${target}-${pkg}-static"
         done
-        # install deps that are not available as static
-        if [ -n "$ENABLE_OPENAL" ]; then
-            for pkg in openal-soft; do
-                set -- "$@" "${target}-${pkg}"
-            done
-        fi
 
         # 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 "$@"
@@ -822,15 +783,12 @@ suse_installdeps() {
     check_cross
     installing
 
-    tools="make cmake ccache nasm gettext-tools pkg-config ccache zip sfml2-devel ninja"
+    tools="make cmake ccache nasm gettext-tools pkg-config ccache zip ninja"
 
-    libs="gcc gcc-c++ libSDL2-devel wxWidgets-3_0-devel" # ffmpeg-devel
-
-    [ -n "$ENABLE_OPENAL" ] && libs="$libs openal-soft-devel"
-    # ffmpeg requires packman repos
+    libs="gcc gcc-c++ SDL3-devel wxGTK3-3_2-devel openal-soft-devel ffmpeg-7-libavcodec-devel ffmpeg-7-libavdevice-devel ffmpeg-7-libavfilter-devel ffmpeg-7-libavformat-devel ffmpeg-7-libavutil-devel ffmpeg-7-libpostproc-devel ffmpeg-7-libswresample-devel ffmpeg-7-libswscale-devel"
 
     if [ "$target" = m32 ]; then
-        libs=$(echo "$libs" | sed -E 's/([^ ]) ([^ ])/\1-32bit \2/g; s/$/-32bit/;')
+        error '32 bit cross builds are no longer supported on OpenSUSE'
     fi
 
     check sudo zypper in -y $tools $libs
@@ -894,9 +852,8 @@ archlinux_installdeps() {
 
     $pacman -Q gtk3-classic >/dev/null 2>&1 && gtk=gtk3-classic
 
-    libs="zlib mesa gettext sdl2 wxgtk3 $gtk sfml"
+    libs="zlib mesa gettext sdl3 wxgtk3 $gtk openal"
 
-    [ -n "$ENABLE_OPENAL" ] && libs="$libs openal"
     [ -n "$ENABLE_FFMPEG" ] && libs="$libs ffmpeg"
 
     if [ -z "$target" -o "$target" = m32 ]; then
@@ -911,7 +868,7 @@ archlinux_installdeps() {
         else
             # try to build 32 bit binaries
 
-            # lib32-sfml and lib32-ffmpeg are in AUR
+            # lib32-ffmpeg is in AUR
             archlinux_require_yaourt
 
             # enable multilib repos if not enabled
@@ -991,9 +948,7 @@ EOF
           fi
         done
 
-        deps="zlib gettext pkg-config sdl2 wxmsw"
-
-        [ -n "$ENABLE_OPENAL" ] && deps="$deps openal"
+        deps="zlib gettext pkg-config sdl3 wxmsw openal"
 
         # and the actual deps
         for p in $deps; do
@@ -1007,8 +962,6 @@ 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
@@ -1024,9 +977,7 @@ solus_installdeps() {
     check sudo eopkg -y install -c system.devel
     check sudo eopkg -y install git ccache ninja
 
-    set -- sdl2-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel
-
-    [ -n "$ENABLE_OPENAL" ] && set -- "$@" openal-soft-devel
+    set -- sdl3-devel wxwidgets-devel libgtk-2-devel libgtk-3-devel libglu-devel openal-soft-devel
 
     if [ -n "$amd64" -a "$target" = m32 ]; then
         info_msg 'Calculating dependencies, this will take a while..'
@@ -1073,13 +1024,12 @@ solus_installdeps() {
         done
     else
         # no 32bit versions of these
-        set -- "$@" SFML-devel ffmpeg-devel
+        set -- "$@" 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
 
@@ -1095,15 +1045,22 @@ gentoo_installdeps() {
     wx_slot=$(equery -qC list -p -F '$slot' x11-libs/wxGTK | grep gtk3 | sort -rV | head -1)
 
     ebuilds="\
-      sys-devel/gcc      sys-devel/make     dev-util/cmake          dev-util/ccache sys-devel/binutils \
-      media-libs/libsdl2 media-libs/libsfml x11-libs/wxGTK:$wx_slot sys-libs/zlib   dev-util/pkgconf \
-      dev-lang/nasm      dev-util/ninja"
-
-    [ -n "$ENABLE_OPENAL" ] && ebuilds="$ebuilds media-libs/openal"
+      sys-devel/gcc \
+      dev-build/make \
+      dev-build/cmake \
+      dev-util/ccache \
+      sys-devel/binutils \
+      media-libs/libsdl3 \
+      media-libs/openal \
+      x11-libs/wxGTK:$wx_slot \
+      sys-libs/zlib \
+      dev-util/pkgconf \
+      dev-lang/nasm \
+      dev-build/ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && ebuilds="$ebuilds media-video/ffmpeg"
 
-    check sudo emerge -vn $ebuilds
+    check sudo emerge -vna $ebuilds
 
     build_instructions
 }
@@ -1111,7 +1068,7 @@ gentoo_installdeps() {
 alpine_installdeps() {
     installing
 
-    check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl2-dev glu-dev sfml-dev wxwidgets-dev gtk+3.0-dev zip
+    check sudo apk add cmake ninja g++ ccache nasm gettext-dev zlib-dev mesa-dev sdl3-dev glu-dev wxwidgets-dev gtk+3.0-dev zip
 
     build_instructions
 }
@@ -1130,10 +1087,10 @@ windows_installdeps() {
 
     case "$target" in
         *clang*)
-            pkgs="lldb"
+            pkgs="lldb clang"
             ;;
         *)
-            pkgs="$pkgs gcc gcc-libs gcc-libgfortran"
+            pkgs="gcc gcc-libs gcc-libgfortran"
             ;;
     esac
 
@@ -1141,11 +1098,19 @@ windows_installdeps() {
         *i686*)
             pkgs="$pkgs nasm"
             ;;
+        *)
+            pkgs="$pkgs FAudio"
+            ;;
     esac
 
-    pkgs="$pkgs SDL2 sfml wxWidgets3.2 zlib binutils cmake crt-git extra-cmake-modules headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache"
+    pkgs="$pkgs SDL3 wxWidgets3.2 zlib binutils cmake crt-git headers-git make pkgconf tools-git windows-default-manifest libmangle-git ninja gdb ccache openal"
+
+    case "$target" in
+        *x86_64)
+            pkgs="$pkgs extra-cmake-modules"
+            ;;
+    esac
 
-    [ -n "$ENABLE_OPENAL" ] && pkgs="$pkgs openal"
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 
     set --
@@ -1210,15 +1175,10 @@ brew_installdeps() {
 
     check brew -v update
 
-    brews="nasm cmake ccache gettext pkg-config sdl2 wxwidgets ccache ninja"
+    brews="nasm cmake ccache gettext libtiff pkg-config sdl3 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
@@ -1241,7 +1201,7 @@ macports_installdeps() {
 
     check sudo port -v selfupdate
 
-    ports="cmake ccache nasm gettext pkgconfig libsdl2 sfml wxWidgets-3.0 libiconv ninja"
+    ports="cmake ccache nasm gettext pkgconfig libsdl3 wxWidgets-3.0 libiconv ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && ports="$ports ffmpeg"
 
@@ -1257,7 +1217,7 @@ fink_installdeps() {
 
     check sudo fink -vy selfupdate
 
-    pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl2 wxwidgets300-osxcocoa libiconv-dev sfml24-dev ccache ninja"
+    pkgs="cmake ccache nasm libgettext8-dev gettext-tools pkgconfig sdl3 wxwidgets300-osxcocoa libiconv-dev ccache ninja"
 
     [ -n "$ENABLE_FFMPEG" ] && pkgs="$pkgs ffmpeg"
 

po/CMakeLists.txt

@@ -1,4 +0,0 @@
-IF(ENABLE_WX)
-  add_subdirectory(wxvbam)
-ENDIF(ENABLE_WX)
-

po/wxvbam/CMakeLists.txt

@@ -1,8 +1,7 @@
+if(NOT TRANSLATIONS_ONLY AND NOT ENABLE_WX)
+    return()
+endif()
+
 file(GLOB po_files "${CMAKE_CURRENT_SOURCE_DIR}/*.po")
 
-gettext_create_translations(
-	wxvbam.pot
-        ${po_files}
-)
-
-add_dependencies(visualboyadvance-m translations)
+gettext_create_translations(wxvbam.pot ${po_files})

po/wxvbam/en_US.po

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

po/wxvbam/es_CO.po

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

po/wxvbam/es_PE.po

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

po/wxvbam/es_US.po

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

po/wxvbam/fr.po

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