build for x86-64-v2 on older linux cpus (#319)

* simplify controller settings menu

* platform pairing hint

.github/workflows/build.yml

@@ -46,3 +46,68 @@ jobs:
 
       - name: Test
         run: dotnet test translator/Translator.sln -c Release --no-build --verbosity normal
+
+  platform_tests:
+    name: Host platform (${{ matrix.runner }})
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [ubuntu-24.04, macos-14, macos-15-intel]
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - name: Configure without graphics dependencies or game assets
+        run: >-
+          cmake -S runtime -B build-platform -G Ninja
+          -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+          -DMKW_BUILD_PRODUCTS=OFF -DMKW_PLATFORM_TESTS_ONLY=ON
+
+      - name: Build and run host-platform tests
+        run: |
+          cmake --build build-platform --parallel 3
+          ctest --test-dir build-platform --output-on-failure
+
+  macos_substrate:
+    name: macOS arm64 (configure + substrate tests)
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+          submodules: recursive
+
+      - name: Test macOS app dependency packaging
+        shell: bash
+        run: bash Launcher/macos/test-publish-app.command
+
+      - name: Configure native runtime
+        shell: bash
+        run: |
+          test "$(uname -m)" = arm64
+          cmake -S runtime -B build-macos -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release -DMKW_BUILD_PRODUCTS=OFF
+          grep -qx 'CMAKE_OSX_DEPLOYMENT_TARGET:STRING=12.0' \
+            build-macos/CMakeCache.txt
+
+      - name: Build macOS portability targets
+        shell: bash
+        run: |
+          cmake --build build-macos --target \
+            mkw_platform_paths_tests \
+            mkw_runtime_config_tests \
+            mkw_nand_save_tests \
+            mkw_nand_settings_tests \
+            mkw_sc_serial_tests \
+            mkw_input_expr_tests \
+            mkw_macos_native_compile \
+            mkw_macos_context_abi_tests \
+            mkw_macos_host_context_tests \
+            mkw_macos_guest_flat_memory_tests \
+            mkw_macos_external_audio_tests
+
+      - name: Test execution substrate
+        shell: bash
+        run: ctest --test-dir build-macos --output-on-failure

.github/workflows/package.yml

@@ -1,8 +1,8 @@
 name: Package installers
 
 # Builds the per-platform installer/setup tool (WiiCompiled-Setup.exe /
-# WiiCompiled-Setup-x86_64.AppImage) via Launcher/Build-Installer.ps1 and
-# Launcher/build-appimage.sh respectively - the same scripts a maintainer runs by hand today to
+# WiiCompiled-Setup-x86_64.AppImage / WiiCompiled-Setup.pkg) via the platform packaging scripts -
+# the same scripts a maintainer runs by hand today to
 # produce a GitHub Release asset. This does NOT build the actual translated game executable:
 # that step requires the end user's own Mario Kart Wii dump (Assets/main.dol, Assets/StaticR.rel),
 # which is proprietary and not present in this repository or in CI.
@@ -11,6 +11,11 @@ on:
     tags:
       - '*'
   workflow_dispatch:
+    inputs:
+      version:
+        description: Package version
+        required: true
+        type: string
 
 permissions:
   contents: read
@@ -39,6 +44,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+          submodules: recursive
 
       - uses: actions/setup-dotnet@v6
         with:
@@ -74,6 +80,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+          submodules: recursive
 
       - uses: actions/setup-dotnet@v6
         with:
@@ -90,14 +97,140 @@ jobs:
           if-no-files-found: error
           archive: false
 
+  macos-setup-package:
+    name: macOS (universal Setup.pkg)
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+          submodules: recursive
+
+      - uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Verify Apple Silicon runner
+        shell: bash
+        run: |
+          test "$(uname -m)" = arm64
+          xcode-select -p
+
+      - name: Download pinned Nod tools
+        shell: bash
+        run: |
+          mkdir -p Launcher/artifacts/macos
+          nodtool_version=v2.0.0-alpha.10
+          nodtool_arm64_asset=nodtool-macos-arm64
+          nodtool_arm64_sha256=e23ca466999b720c55e6d29c9683fce8cc74451ba64ead2e543d50129f24528a
+          nodtool_x86_64_asset=nodtool-macos-x86_64
+          nodtool_x86_64_sha256=f68f504dc2b72694b468ca78b6a24142c7aa5c8800f77564297f4143682e6575
+          curl -fsSL --retry 3 \
+            "https://github.com/encounter/nod/releases/download/${nodtool_version}/${nodtool_arm64_asset}" \
+            -o Launcher/artifacts/macos/nodtool-arm64
+          curl -fsSL --retry 3 \
+            "https://github.com/encounter/nod/releases/download/${nodtool_version}/${nodtool_x86_64_asset}" \
+            -o Launcher/artifacts/macos/nodtool-x86_64
+          printf '%s  %s\n' "$nodtool_arm64_sha256" Launcher/artifacts/macos/nodtool-arm64 | shasum -a 256 -c -
+          printf '%s  %s\n' "$nodtool_x86_64_sha256" Launcher/artifacts/macos/nodtool-x86_64 | shasum -a 256 -c -
+          chmod +x Launcher/artifacts/macos/nodtool-arm64 Launcher/artifacts/macos/nodtool-x86_64
+
+      - name: Publish self-contained Translator tools
+        shell: bash
+        run: |
+          dotnet publish translator/src/Translator.Cli/Translator.Cli.csproj \
+            -c Release -r osx-arm64 --self-contained true \
+            -p:PublishSingleFile=true \
+            -o Launcher/artifacts/macos/translator-arm64
+          dotnet publish translator/src/Translator.Cli/Translator.Cli.csproj \
+            -c Release -r osx-x64 --self-contained true \
+            -p:PublishSingleFile=true \
+            -o Launcher/artifacts/macos/translator-x86_64
+
+      - name: Download pinned universal Ninja
+        shell: bash
+        run: |
+          ninja_version=1.13.2
+          ninja_sha256=c99048673aa765960a99cf10c6ddb9f1fad506099ff0a0e137ad8960a88f321b
+          curl -fsSL --retry 3 "https://github.com/ninja-build/ninja/releases/download/v${ninja_version}/ninja-mac.zip" -o ninja-mac.zip
+          printf '%s  %s\n' "$ninja_sha256" ninja-mac.zip | shasum -a 256 -c -
+          unzip -q ninja-mac.zip -d Launcher/artifacts/macos/ninja
+          chmod +x Launcher/artifacts/macos/ninja/ninja
+
+      - name: Download pinned portable CMake
+        shell: bash
+        run: |
+          cmake_version=4.4.3
+          archive="cmake-${cmake_version}-macos-universal.tar.gz"
+          base_url="https://github.com/Kitware/CMake/releases/download/v${cmake_version}"
+          expected_sha256=0c5d65251c14cc884bfa16bdbed3c263ce5bffe2e21c0d0d00962cb0610464fa
+          curl -fsSL --retry 3 "$base_url/$archive" -o "$archive"
+          printf '%s  %s\n' "$expected_sha256" "$archive" | shasum -a 256 -c -
+          tar -xzf "$archive"
+          mv "cmake-${cmake_version}-macos-universal/CMake.app/Contents" Launcher/artifacts/macos/cmake
+
+      - name: Build Setup.pkg
+        env:
+          PACKAGE_VERSION: ${{ inputs.version }}
+          TAG_VERSION: ${{ github.ref_name }}
+        shell: bash
+        run: |
+          package_version="$PACKAGE_VERSION"
+          if [[ -z "$package_version" ]]; then
+            if [[ "${TAG_VERSION:-}" =~ ^v?[0-9] ]]; then
+              package_version="${TAG_VERSION#v}"
+            elif [[ -f "Launcher/Directory.Build.props" ]]; then
+              package_version=$(grep -m1 '<Version>' Launcher/Directory.Build.props | sed -E 's/.*<Version>([^<]+)<\/Version>.*/\1/')
+            fi
+          fi
+          mkdir -p Launcher/dist
+          Launcher/macos/build-setup-pkg.command \
+            --nodtool-arm64 Launcher/artifacts/macos/nodtool-arm64 \
+            --nodtool-x86_64 Launcher/artifacts/macos/nodtool-x86_64 \
+            --translator-arm64 Launcher/artifacts/macos/translator-arm64/Translator.Cli \
+            --translator-x86_64 Launcher/artifacts/macos/translator-x86_64/Translator.Cli \
+            --cmake-root Launcher/artifacts/macos/cmake \
+            --ninja-arm64 Launcher/artifacts/macos/ninja/ninja \
+            --ninja-x86_64 Launcher/artifacts/macos/ninja/ninja \
+            --output Launcher/dist/WiiCompiled-Setup.pkg \
+            ${package_version:+--version "$package_version"}
+
+      - name: Verify package layout and architecture-specific tools
+        shell: bash
+        run: |
+          pkgutil --check-signature Launcher/dist/WiiCompiled-Setup.pkg || true
+          if pkgutil --payload-files Launcher/dist/WiiCompiled-Setup.pkg | \
+            grep -E '/(Assets|generated|PulsarPacks|WiiCompiled.app|RetroRewind.app)(/|$)'; then
+            echo "::error::Setup.pkg contains a forbidden payload"
+            exit 1
+          fi
+          expanded="$RUNNER_TEMP/wiicompiled-setup-expanded"
+          pkgutil --expand-full Launcher/dist/WiiCompiled-Setup.pkg "$expanded"
+          resources="$expanded/Payload/Applications/WiiCompiled Setup.app/Contents/Resources"
+          for arch in arm64 x86_64; do
+            for tool in nodtool Translator.Cli ninja; do
+              lipo "$resources/tools/$arch/$tool" -verify_arch "$arch"
+            done
+          done
+          lipo "$resources/tools/cmake/bin/cmake" -verify_arch arm64 x86_64
+          bash "$resources/setup.command" --help
+          /usr/bin/arch -x86_64 /bin/bash "$resources/setup.command" --help
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: WiiCompiled-Setup-macos-universal
+          path: Launcher/dist/WiiCompiled-Setup.pkg
+          if-no-files-found: error
+          archive: false
+
   # Publishes the packaged installers as a GitHub Release whenever a v* tag is pushed. Wheel Wizard
   # discovers updates from these releases, so the contract it relies on is enforced here: a full
-  # (non-prerelease) release whose tag is v<semver>, carrying an asset named exactly
-  # WiiCompiled-Setup.exe, produced by a setup host that reports that same version.
+  # (non-prerelease) release whose tag is v<semver>, carrying the expected platform assets,
+  # produced by setup hosts that report that same version.
   release:
     name: Publish GitHub Release
     if: startsWith(github.ref, 'refs/tags/v')
-    needs: [linux-appimage, windows-installer, recompilation]
+    needs: [linux-appimage, windows-installer, macos-setup-package, recompilation]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -105,9 +238,10 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+          submodules: recursive
 
       # Wheel Wizard runs the downloaded setup with --version and refuses it when the reported
-      # version differs from the release tag, so a tag that was pushed without bumping every pinned
+      # version differs from the release tag, so a tag that was pushed without bumping the pinned
       # version would ship an update nobody can install. Catch that before anything is published.
       - name: Verify the tag matches the pinned setup version
         env:
@@ -122,9 +256,7 @@ jobs:
               status=1
             fi
           }
-          check Launcher/WiiCompiled.Setup.Windows/Program.cs "public const string Version = \"$version\";"
-          check Launcher/WiiCompiled.Setup.Windows/WiiCompiled.Setup.Windows.csproj "<Version>$version</Version>"
-          check Launcher/Build-Installer.ps1 "ProductVersion = '$version'"
+          check Launcher/Directory.Build.props "<Version>$version</Version>"
           exit $status
 
       # The build jobs upload with `archive: false`, which stores each installer as a raw file
@@ -143,7 +275,7 @@ jobs:
           set -euo pipefail
           ls -lR artifacts
           assets=()
-          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage; do
+          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage WiiCompiled-Setup.pkg; do
             found="$(find artifacts -type f -name "$name" | head -n 1)"
             [ -n "$found" ] && [ -s "$found" ] || { echo "::error::missing release asset $name"; exit 1; }
             assets+=("$found")

.github/workflows/recomp-test.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+          submodules: recursive
 
       - uses: actions/setup-dotnet@v6
         with:
@@ -45,6 +46,20 @@ jobs:
         shell: pwsh
         run: ./Launcher/Prepare-PortableTools.ps1
 
+      - name: Build and run Windows host-platform tests
+        shell: pwsh
+        run: |
+          $tools = Join-Path $PWD 'Launcher/artifacts/portable-tools'
+          $env:PATH = "$tools/llvm-mingw/bin;$tools/CMake/bin;$tools/Ninja;$env:PATH"
+          cmake -S runtime -B build-platform -G Ninja `
+            -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ `
+            -DMKW_BUILD_PRODUCTS=OFF -DMKW_PLATFORM_TESTS_ONLY=ON
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+          cmake --build build-platform --parallel 3
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+          ctest --test-dir build-platform --output-on-failure
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
       - name: Prepare pinned native dependencies
         shell: pwsh
         run: ./Launcher/Prepare-Dependencies.ps1

.gitignore

@@ -1,4 +1,5 @@
 /generated/
+/runtime/native-index.json
 /Assets/
 /assets/
 /PulsarPacks/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "aurora-main"]
+	path = aurora-main
+	url = https://github.com/patchzyy/aurora-wiicompiled.git
+	branch = main

Launcher/Build-Installer.ps1

@@ -73,7 +73,16 @@ function Resolve-VcRuntimeDirectory([string]$RequestedPath) {
 function Copy-Directory([string]$Source, [string]$Destination) {
     Assert-Directory $Source "Source directory"
     [IO.Directory]::CreateDirectory($Destination) | Out-Null
-    Copy-Item -Path (Join-Path $Source '*') -Destination $Destination -Recurse -Force
+    # Source payloads are materialized trees, independent of Git checkout metadata.
+    foreach ($entry in Get-ChildItem -LiteralPath $Source -Force) {
+        if ($entry.Name -eq '.git') { continue }
+        $target = Join-Path $Destination $entry.Name
+        if ($entry.PSIsContainer) {
+            Copy-Directory $entry.FullName $target
+        } else {
+            Copy-Item -LiteralPath $entry.FullName -Destination $target -Force
+        }
+    }
 }
 function Compress-Zip([string]$Source, [string]$Destination, [string[]]$Entries) {
     $tar = Join-Path $env:SystemRoot 'System32\tar.exe'
@@ -112,6 +121,20 @@ Assert-Directory $dependencySources 'Pinned offline dependency sources'
 # back to compiling aurora from source, which is what this package exists to
 # avoid - and a mismatched one would be an ABI hazard.
 $portableClangHash = Get-MkwFileSha256 (Join-Path $portableTools 'llvm-mingw\bin\clang-22.exe')
+# The identity the runtime build compares against the package's runtime archive.
+function Get-RuntimeSourceFingerprint([string]$RuntimeDirectory, [string]$DependenciesDirectory) {
+    $arguments = @("-DMKW_RUNTIME_DIR=$(ConvertTo-MkwCMakePath $RuntimeDirectory)")
+    $cppWinRt = Join-Path $DependenciesDirectory 'cppwinrt'
+    if (Test-Path -LiteralPath (Join-Path $cppWinRt 'winrt\base.h') -PathType Leaf) {
+        $arguments += "-DMKW_CPPWINRT_INCLUDE_DIR=$(ConvertTo-MkwCMakePath $cppWinRt)"
+    }
+    $arguments += @('-P', (ConvertTo-MkwCMakePath (Join-Path $RuntimeDirectory 'cmake\RuntimeFingerprint.cmake')))
+    $output = @(& (Join-Path $portableTools 'CMake\bin\cmake.exe') @arguments)
+    if ($LASTEXITCODE -ne 0) { throw "Runtime fingerprinting failed with exit code $LASTEXITCODE." }
+    $line = $output | Where-Object { "$_" -match '^runtime_fingerprint=[0-9a-f]{64}$' } | Select-Object -First 1
+    if (-not $line) { throw "RuntimeFingerprint.cmake printed no fingerprint: $($output -join ' ')" }
+    return "$line".Substring('runtime_fingerprint='.Length)
+}
 function Test-NativePrebuiltCurrent([string]$PackageDirectory) {
     $provenancePath = Join-Path $PackageDirectory 'provenance.json'
     if (-not (Test-Path -LiteralPath $provenancePath -PathType Leaf)) { return $false }
@@ -129,6 +152,9 @@ function Test-NativePrebuiltCurrent([string]$PackageDirectory) {
     # release ships runtime/third_party sources that first-party TUs compile
     # against, so archives harvested before a vendored change are stale.
     $recordedThirdParty = $provenance.PSObject.Properties['ThirdPartySourceFingerprint']
+    # The precompiled runtime archive must be from these runtime sources; a package without one
+    # would make every installation compile the runtime itself.
+    $recordedRuntime = $provenance.PSObject.Properties['RuntimeSourceFingerprint']
     return ($provenance.CompilerSha256 -eq $portableClangHash) -and
            ($provenance.FlagFingerprint -eq (Get-MkwNativeFlagFingerprint)) -and
            ($null -ne $recordedDawn) -and
@@ -136,11 +162,13 @@ function Test-NativePrebuiltCurrent([string]$PackageDirectory) {
            ($null -ne $recordedAurora) -and
            ($recordedAurora.Value -eq (Get-MkwAuroraSourceFingerprint (Join-Path $repoRoot 'aurora-main'))) -and
            ($null -ne $recordedThirdParty) -and
-           ($recordedThirdParty.Value -eq (Get-MkwThirdPartySourceFingerprint (Join-Path $repoRoot 'runtime\third_party')))
+           ($recordedThirdParty.Value -eq (Get-MkwThirdPartySourceFingerprint (Join-Path $repoRoot 'runtime\third_party'))) -and
+           ($null -ne $recordedRuntime) -and
+           ($recordedRuntime.Value -eq (Get-RuntimeSourceFingerprint (Join-Path $repoRoot 'runtime') $dependencySources))
 }
 $nativePrebuiltPackage = Join-Path $dependencySources 'native_prebuilt'
 if (-not (Test-NativePrebuiltCurrent $nativePrebuiltPackage)) {
-    Write-Host '[0/6] Building the precompiled aurora and third-party package...'
+    Write-Host '[0/6] Building the precompiled aurora, third-party and runtime package...'
     & (Join-Path $PSScriptRoot 'Prepare-NativePrebuilt.ps1') `
         -PortableToolsDirectory $portableTools -DependencySourceDirectory $dependencySources
     if ($LASTEXITCODE -ne 0) { throw 'Precompiled aurora package preparation failed.' }
@@ -222,6 +250,22 @@ Copy-Item -LiteralPath (Join-Path $PSScriptRoot 'NativeBuildFlags.ps1') -Destina
 [IO.Directory]::CreateDirectory((Join-Path $workspace 'Dependencies')) | Out-Null
 foreach ($name in $requiredDependencies) { Copy-Directory (Join-Path $dependencySources $name) (Join-Path $workspace "Dependencies\$name") }
 
+# The translation identity covers the runtime's native registrations through this index (see
+# ToolkitFingerprint), so it is extracted from exactly the staged runtime sources.
+$nativeIndex = Join-Path $workspace 'runtime\native-index.json'
+# The payload has no game inputs, so the project file (which validates them) cannot be loaded here.
+& $translator emit-native-index --native-source-dir (Join-Path $workspace 'runtime\src') --out $nativeIndex
+if ($LASTEXITCODE -ne 0) { throw "Native index extraction failed with exit code $LASTEXITCODE." }
+Assert-File $nativeIndex 'Runtime native index'
+# A staged runtime that fingerprints differently from the shipped archive would make every
+# installation silently compile the runtime from source.
+$stagedRuntimeFingerprint = Get-RuntimeSourceFingerprint (Join-Path $workspace 'runtime') (Join-Path $workspace 'Dependencies')
+$packagedRuntimeFingerprint = (Get-Content -LiteralPath (Join-Path $workspace 'Dependencies\native_prebuilt\provenance.json') -Raw |
+    ConvertFrom-Json).RuntimeSourceFingerprint
+if ($stagedRuntimeFingerprint -ne $packagedRuntimeFingerprint) {
+    throw "The staged runtime ($stagedRuntimeFingerprint) does not match the precompiled runtime archive ($packagedRuntimeFingerprint)."
+}
+
 [IO.Directory]::CreateDirectory((Join-Path $payloadRoot 'host')) | Out-Null
 Copy-Item $setupHost (Join-Path $payloadRoot 'host\WiiCompiled-Setup.exe')
 
@@ -279,9 +323,12 @@ foreach ($required in @('ToolkitFingerprint','TranslationFingerprint','NativeToo
     if ([string]::IsNullOrWhiteSpace($identities.$required)) { throw "Payload identity output is missing $required." }
 }
 
+$productVersion = ((& $setupHost --version) -join '').Trim()
+if ($LASTEXITCODE -ne 0 -or [string]::IsNullOrWhiteSpace($productVersion)) { throw 'The setup host did not report its version.' }
+
 $manifest = [ordered]@{
     SchemaVersion = 2
-    ProductVersion = '0.2.32'
+    ProductVersion = $productVersion
     ExpectedGameId = $pins.GameId
     ExpectedDolSha256 = $pins.DolSha256
     ExpectedRelSha256 = $pins.RelSha256

Launcher/Directory.Build.props

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <!-- The one product version. Release tags must match it. -->
+    <Version>0.2.35</Version>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+  </PropertyGroup>
+</Project>

Launcher/LocalBuild.ps1

@@ -103,7 +103,7 @@ function Write-MkwBuildStep([string]$StepId, [string]$Message) {
 function Reset-LocalDirectory([string]$Path) {
     $full = [IO.Path]::GetFullPath($Path)
     $root = [IO.Path]::GetFullPath($Workspace).TrimEnd('\') + '\'
-    $installRoot = [IO.Path]::GetFullPath((Split-Path -Parent $Workspace)).TrimEnd('\') + '\'
+    $installRoot = [IO.Path]::GetFullPath((Split-Path -Parent $realWorkspace)).TrimEnd('\') + '\'
     # The caller-supplied output destinations are legitimate reset targets by
     # definition, wherever the caller placed them: a fresh install's operation
     # scratch lives beside the installation directory rather than inside it.
@@ -150,8 +150,16 @@ if ($Profile -eq 'both' -and [string]::IsNullOrWhiteSpace($BaseOutputDirectory))
 if ($Profile -ne 'both' -and -not [string]::IsNullOrWhiteSpace($BaseOutputDirectory)) {
     throw '-BaseOutputDirectory is valid only with -Profile both.'
 }
+$realWorkspace = $Workspace.TrimEnd('\')
+$Workspace = Get-MkwBuildSafePath $realWorkspace 'workspace' 'runtime\CMakeLists.txt'
+# A selected package inside the install may also name the same Code.pul through the real path.
+# Give it the workspace spelling before comparing it with the staged copy.
+if (-not [string]::IsNullOrWhiteSpace($RetroRewindPackageDirectory) -and
+    $RetroRewindPackageDirectory.StartsWith($realWorkspace + '\', [StringComparison]::OrdinalIgnoreCase)) {
+    $RetroRewindPackageDirectory = $Workspace + $RetroRewindPackageDirectory.Substring($realWorkspace.Length)
+}
 $translator = Join-Path $Toolkit 'Translator\Translator.Cli.exe'
-$toolchain = Get-MkwShellSafeToolchainRoot $Toolkit
+$toolchain = Get-MkwBuildSafePath $Toolkit 'toolchain' 'CMake\bin\cmake.exe'
 $cmake = Join-Path $toolchain 'CMake\bin\cmake.exe'
 $ninja = Join-Path $toolchain 'Ninja\ninja.exe'
 $toolchainBin = Join-Path $toolchain 'llvm-mingw\bin'
@@ -415,13 +423,14 @@ try {
             $exe = Join-Path $build "$Target.exe"
             Assert-File $exe 'Locally compiled game executable'
             Copy-Item -LiteralPath $exe -Destination (Join-Path $Destination "$Target.exe")
-            foreach ($name in @('dxcompiler.dll','dxil.dll','libc++.dll','libpng16.dll','libunwind.dll','libz.dll','SDL3.dll','sqlite3.dll','webgpu_dawn.dll','z.dll','noshaders.zip','dsp_coef.bin','initial_pipeline_cache.db')) {
+            foreach ($name in @('dxcompiler.dll','dxil.dll','libc++.dll','libpng16.dll','libunwind.dll','libz.dll','libzlib1.dll','SDL3.dll','sqlite3.dll','webgpu_dawn.dll','z.dll','noshaders.zip','dsp_coef.bin','initial_pipeline_cache.db')) {
                 $file = Join-Path $build $name
                 if (Test-Path -LiteralPath $file -PathType Leaf) { Copy-Item -LiteralPath $file -Destination $Destination }
             }
             $redist = Join-Path $Toolkit 'Redist'
             if (Test-Path -LiteralPath $redist -PathType Container) {
-                Copy-Item -Path (Join-Path $redist '*.dll') -Destination $Destination -Force
+                Get-ChildItem -LiteralPath $redist -Filter '*.dll' -File |
+                    Copy-Item -Destination $Destination -Force
             }
             foreach ($name in @('config','wii_bootstrap')) {
                 $directory = Join-Path $build $name

Launcher/NativeBuildFlags.ps1

@@ -40,41 +40,55 @@ function Get-MkwToolchainPath([string]$ToolchainRoot) {
     ) -join ';')
 }
 
-function Get-MkwShellSafeToolchainRoot([string]$ToolchainRoot) {
-    if ([string]::IsNullOrWhiteSpace($ToolchainRoot)) { throw 'A toolchain root is required.' }
-    $full = [IO.Path]::GetFullPath($ToolchainRoot)
+function Get-MkwBuildSafePath([string]$Path, [string]$Kind, [string]$MarkerFile) {
+    <#
+    The Windows native build passes workspace paths through CMake, Ninja response files and
+    clang, which do not all interpret quotes the same way. Keep those paths plain even when the
+    user's install directory contains an apostrophe, ampersand or other punctuation.
+    #>
+    if ([string]::IsNullOrWhiteSpace($Path)) { throw "A $Kind path is required." }
+    $full = [IO.Path]::GetFullPath($Path)
     # A drive root keeps its separator: "C:" is relative to the current directory on that drive.
     if ($full -ne [IO.Path]::GetPathRoot($full)) { $full = $full.TrimEnd('\') }
-    if ($full -notmatch '[()&^%!]') { return $full }
+    if ($full -cmatch '^[A-Za-z0-9 ._\\:-]+$') { return $full }
+
+    Assert-File (Join-Path $full $MarkerFile) "$Kind marker"
 
     $sha = [Security.Cryptography.SHA256]::Create()
     try {
         $bytes = $sha.ComputeHash([Text.Encoding]::UTF8.GetBytes($full.ToLowerInvariant()))
     } finally { $sha.Dispose() }
-    $linkName = 'toolchain-' + ((($bytes[0..7]) | ForEach-Object { $_.ToString('x2') }) -join '')
+    $linkName = "$Kind-" + ((($bytes[0..7]) | ForEach-Object { $_.ToString('x2') }) -join '')
 
     $failures = @()
     foreach ($base in @($env:ProgramData, $env:PUBLIC)) {
-        if ([string]::IsNullOrWhiteSpace($base) -or $base -match '[()&^%! ]') { continue }
+        if ([string]::IsNullOrWhiteSpace($base) -or $base -cnotmatch '^[A-Za-z0-9._\\:-]+$') { continue }
         $link = Join-Path (Join-Path $base 'WiiCompiled') $linkName
         try {
             [IO.Directory]::CreateDirectory((Split-Path -Parent $link)) | Out-Null
-            # The name already identifies the target, so an existing junction that still resolves is
-            # this one; only a broken leftover is replaced. Directory.Delete removes the reparse
-            # point itself, where Remove-Item -Recurse would delete the toolchain it points at.
-            if (-not (Test-Path -LiteralPath (Join-Path $link 'CMake\bin\cmake.exe') -PathType Leaf)) {
-                if (Test-Path -LiteralPath $link) { [IO.Directory]::Delete($link) }
+            $existing = Get-Item -LiteralPath $link -Force -ErrorAction SilentlyContinue
+            if ($null -ne $existing) {
+                # Never trust a directory just because it has the marker: it could point at a
+                # different installation. Nor may we remove a directory we did not create.
+                if ($existing.LinkType -ne 'Junction' -or
+                    @($existing.Target).Count -ne 1 -or
+                    -not [string]::Equals([IO.Path]::GetFullPath(@($existing.Target)[0]),
+                        $full, [StringComparison]::OrdinalIgnoreCase)) {
+                    throw "An existing path is not the expected junction: $link"
+                }
+            } else {
                 New-Item -ItemType Junction -Path $link -Target $full -ErrorAction Stop | Out-Null
             }
-            Write-Host "MKWCBUILD: Building through $link, because $full contains characters cmd.exe cannot parse"
+            Assert-File (Join-Path $link $MarkerFile) "$Kind junction marker"
+            Write-Host "MKWCBUILD: Building the $Kind through $link, because $full contains characters the native build cannot quote reliably"
             return $link
         } catch {
             $failures += "$link ($($_.Exception.Message))"
         }
     }
-    throw ("The toolchain path $full contains a character (one of ( ) & ^ % !) that the compiler " +
-        'cannot be invoked through, and no junction to it could be created: ' + ($failures -join '; ') +
-        '. Install to a path without those characters.')
+    throw ("The $Kind path $full cannot be passed safely to the native build, and no junction " +
+        'to it could be created: ' + ($failures -join '; ') + '. Install to a path of plain ' +
+        'letters, digits and spaces, or make a safe junction location available.')
 }
 
 function Get-MkwProjectPins([string]$ProjectFile) {
@@ -131,15 +145,23 @@ function Invoke-Checked([string]$FilePath, [string[]]$Arguments, [string]$Descri
     else { Write-Host "${LogPrefix}: $Description" }
     $quotedArguments = @($Arguments | ForEach-Object {
         if ($_.Contains('"')) { throw "A native build argument contains an unsupported quote: $_" }
-        '"' + $_ + '"'
+        # Backslashes directly before the closing quote would otherwise escape it.
+        '"' + ($_ -replace '(\\+)$', '$1$1') + '"'
     })
     if ($WaitForProcessTree) {
         $process = Start-Process -FilePath $FilePath -ArgumentList $quotedArguments `
             -NoNewWindow -Wait -PassThru
         $exitCode = $process.ExitCode
     } else {
-        & $FilePath @Arguments
-        $exitCode = $LASTEXITCODE
+        # Tools report progress on stderr (CMake message()); only the exit code decides failure.
+        $previousPreference = $ErrorActionPreference
+        $ErrorActionPreference = 'Continue'
+        try {
+            & $FilePath @Arguments
+            $exitCode = $LASTEXITCODE
+        } finally {
+            $ErrorActionPreference = $previousPreference
+        }
     }
     $global:LASTEXITCODE = $exitCode
     if ($exitCode -ne 0) { throw "$Description failed with exit code $exitCode." }
@@ -193,13 +215,14 @@ function Get-MkwThirdPartySourceFingerprint([string]$ThirdPartyDirectory) {
     SHA-256 over runtime/third_party, the vendored sources behind the prebuilt package. The
     precompiled Crypto++ archive is linked while first-party TUs compile against the same headers,
     so a workspace whose vendored tree moved on must not consume archives harvested from an older
-    one (same reasoning as the aurora fingerprint below). Unlike that scan this hashes hidden files
-    too, since Build-Installer stages this tree with Copy-Item -Force. Returns '' when absent.
+    one (same reasoning as the aurora fingerprint below), skipping dot-paths by name the same way.
+    Returns '' when absent.
     #>
     if ([string]::IsNullOrWhiteSpace($ThirdPartyDirectory)) { return '' }
     if (-not (Test-Path -LiteralPath $ThirdPartyDirectory -PathType Container)) { return '' }
     $root = [IO.Path]::GetFullPath($ThirdPartyDirectory).TrimEnd('\')
-    $files = Get-ChildItem -LiteralPath $root -Recurse -File |
+    $files = Get-ChildItem -LiteralPath $root -Recurse -File -Force |
+        Where-Object { -not ($_.FullName.Substring($root.Length + 1) -split '\\' | Where-Object { $_.StartsWith('.') }) } |
         Sort-Object { $_.FullName.Substring($root.Length + 1).Replace('\', '/') }
     $sha = [Security.Cryptography.SHA256]::Create()
     try {
@@ -230,13 +253,13 @@ function Get-MkwAuroraSourceFingerprint([string]$AuroraDirectory) {
         (Join-Path $root 'extern') + '\',
         (Join-Path $root 'build') + '\'
     )
-    # Hidden files are skipped deliberately: Build-Installer.ps1 stages this tree
-    # with Copy-Item -Recurse (no -Force), so they never reach the payload and
-    # hashing them would make the two sides disagree by construction.
-    $files = Get-ChildItem -LiteralPath $root -Recurse -File |
+    # Dot-paths (the submodule's .git pointer) are skipped by name, not by the hidden attribute:
+    # the payload zip drops that attribute, so the installed side would otherwise hash them.
+    $files = Get-ChildItem -LiteralPath $root -Recurse -File -Force |
         Where-Object {
             $full = $_.FullName
-            -not ($excludedPrefixes | Where-Object { $full.StartsWith($_, [StringComparison]::OrdinalIgnoreCase) })
+            -not ($excludedPrefixes | Where-Object { $full.StartsWith($_, [StringComparison]::OrdinalIgnoreCase) }) -and
+            -not ($full.Substring($root.Length + 1) -split '\\' | Where-Object { $_.StartsWith('.') })
         } |
         Sort-Object { $_.FullName.Substring($root.Length + 1).Replace('\', '/') }
     $sha = [Security.Cryptography.SHA256]::Create()

Launcher/Prepare-Dependencies.ps1

@@ -21,16 +21,21 @@ $auroraExtern = Join-Path $repoRoot 'aurora-main\extern\CMakeLists.txt'
 $auroraDawn = Join-Path $repoRoot 'aurora-main\cmake\AuroraDawnProvider.cmake'
 $auroraLibUsb = Join-Path $repoRoot 'aurora-main\cmake\AuroraLibUSB.cmake'
 $auroraSdl = Join-Path $repoRoot 'aurora-main\cmake\AuroraSDL3Provider.cmake'
+$auroraVersions = Join-Path $repoRoot 'aurora-main\cmake\AuroraDependencyVersions.cmake'
+$auroraImgui = Join-Path $repoRoot 'aurora-main\cmake\AuroraDearImguiProvider.cmake'
+if (-not (Test-Path -LiteralPath $auroraCMake -PathType Leaf)) {
+    throw 'Aurora sources are missing. Run git submodule update --init --recursive from the repository root first.'
+}
 
 # Name = directory under the destination; FetchContent maps it back through
 # FETCHCONTENT_SOURCE_DIR_<UPPERCASE NAME> (NativeBuildFlags.ps1), so the names are the declared
 # FetchContent names, not the upstream project names.
 $packages = @(
     [pscustomobject]@{
-        Name = 'SDL'; File = 'SDL3-3.4.4.tar.gz'
-        Uris = @('https://github.com/libsdl-org/SDL/releases/download/release-3.4.4/SDL3-3.4.4.tar.gz')
-        Pins = @(@{ File = $auroraCMake; Text = 'set(AURORA_SDL3_VERSION "3.4.4"' },
-                 @{ File = $auroraSdl; Text = 'releases/download/release-${AURORA_SDL3_VERSION}/SDL3-${AURORA_SDL3_VERSION}.tar.gz' })
+        Name = 'SDL'; File = 'SDL3-3.4.10.tar.gz'
+        Uris = @('https://github.com/libsdl-org/SDL/releases/download/release-3.4.10/SDL3-3.4.10.tar.gz')
+        Pins = @(@{ File = $auroraVersions; Text = '_aurora_dependency_version(AURORA_SDL3_REF "refs/tags/release-3.4.10"' },
+                 @{ File = $auroraSdl; Text = 'URL "https://github.com/libsdl-org/SDL/archive/${AURORA_SDL3_REF}.tar.gz"' })
     },
     [pscustomobject]@{
         Name = 'abseil-cpp'; File = 'abseil-cpp-20240722.0.tar.gz'
@@ -38,15 +43,15 @@ $packages = @(
         Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz' })
     },
     [pscustomobject]@{
-        Name = 'dawn_prebuilt'; File = 'dawn-v20260603.191052-windows-amd64.tar.gz'
-        Uris = @('https://github.com/theofficialgman/dawn-build/releases/download/v20260603.191052/dawn-windows-amd64.tar.gz')
-        Pins = @(@{ File = $auroraCMake; Text = 'set(AURORA_DAWN_VERSION "v20260603.191052"' },
-                 @{ File = $auroraDawn; Text = 'SHA256=13be9cff8b9b179c42dcd16aeabb6effcc8f0dfdcc14463eda2a5caeda225142' })
+        Name = 'dawn_prebuilt'; File = 'dawn-v20260807.225922-windows-amd64.tar.gz'
+        Uris = @('https://github.com/encounter/dawn/releases/download/v20260807.225922/dawn-windows-amd64.tar.gz')
+        Pins = @(@{ File = $auroraVersions; Text = '_aurora_dependency_version(AURORA_DAWN_VERSION "v20260807.225922"' },
+                 @{ File = $auroraDawn; Text = 'SHA256=42a7a295c87b2e8a36312e2f84a5823aac63325e8e1d271bc7ced6f83bfb075f' })
     },
     [pscustomobject]@{
-        Name = 'fmt'; File = 'fmt-11.1.4.tar.gz'
-        Uris = @('https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz' })
+        Name = 'fmt'; File = 'fmt-12.1.0.tar.gz'
+        Uris = @('https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz')
+        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz' })
     },
     [pscustomobject]@{
         Name = 'freetype'; File = 'freetype-2.14.3.tar.gz'
@@ -58,12 +63,12 @@ $packages = @(
     [pscustomobject]@{
         Name = 'imgui'; File = 'imgui-1.91.9b-docking.tar.gz'
         Uris = @('https://github.com/ocornut/imgui/archive/refs/tags/v1.91.9b-docking.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/ocornut/imgui/archive/refs/tags/v1.91.9b-docking.tar.gz' })
+        Pins = @(@{ File = $auroraImgui; Text = 'https://github.com/ocornut/imgui/archive/refs/tags/v1.91.9b-docking.tar.gz' })
     },
     [pscustomobject]@{
         Name = 'libusb'; File = 'libusb-1.0.30.tar.bz2'
         Uris = @('https://github.com/libusb/libusb/releases/download/v1.0.30/libusb-1.0.30.tar.bz2')
-        Pins = @(@{ File = $auroraCMake; Text = 'set(AURORA_LIBUSB_VERSION "1.0.30"' },
+        Pins = @(@{ File = $auroraVersions; Text = '_aurora_dependency_version(AURORA_LIBUSB_VERSION "1.0.30"' },
                  @{ File = $auroraLibUsb; Text = 'releases/download/v${AURORA_LIBUSB_VERSION}/libusb-${AURORA_LIBUSB_VERSION}.tar.bz2' })
     },
     [pscustomobject]@{
@@ -77,19 +82,19 @@ $packages = @(
         Pins = @(@{ File = $auroraExtern; Text = 'https://sqlite.org/2026/sqlite-amalgamation-3510300.zip' })
     },
     [pscustomobject]@{
-        Name = 'tracy'; File = 'tracy-a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz'
-        Uris = @('https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz' })
+        Name = 'tracy'; File = 'tracy-0.14.1.zip'
+        Uris = @('https://github.com/wolfpld/tracy/archive/refs/tags/v0.14.1.zip')
+        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/wolfpld/tracy/archive/refs/tags/v0.14.1.zip' })
     },
     [pscustomobject]@{
-        Name = 'xxhash'; File = 'xxHash-0.8.3.tar.gz'
-        Uris = @('https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz' })
+        Name = 'xxhash'; File = 'xxHash-0.8.4.tar.gz'
+        Uris = @('https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.4.tar.gz')
+        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.4.tar.gz' })
     },
     [pscustomobject]@{
-        Name = 'zlib'; File = 'zlib-1.3.2.tar.gz'
-        Uris = @('https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz')
-        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz' })
+        Name = 'zlib'; File = 'zlib-ng-2.3.3.tar.gz'
+        Uris = @('https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.3.3.tar.gz')
+        Pins = @(@{ File = $auroraExtern; Text = 'https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.3.3.tar.gz' })
     },
     [pscustomobject]@{
         Name = 'zstd'; File = 'zstd-1.5.7.tar.gz'
@@ -168,8 +173,12 @@ function Expand-Package([string]$Archive, [string]$Target) {
 foreach ($package in $packages) {
     Assert-Pinned $package
     $target = Join-Path $Destination $package.Name
-    if (Test-Path -LiteralPath $target -PathType Container) { continue }
+    # Records which archive a tree came from, so a pin change replaces a stale tree.
+    $stamp = $target + '.source'
+    $current = (Test-Path -LiteralPath $stamp -PathType Leaf) -and ([IO.File]::ReadAllText($stamp) -eq $package.File)
+    if ($current -and (Test-Path -LiteralPath $target -PathType Container)) { continue }
     Expand-Package (Get-Archive $package) $target
+    [IO.File]::WriteAllText($stamp, $package.File)
     Write-Host "Prepared $($package.Name)"
 }
 

Launcher/Prepare-NativePrebuilt.ps1

@@ -1,7 +1,8 @@
 # Builds the redistributable precompiled aurora + third-party package: aurora (~43% of local build
 # CPU time) and vendored Crypto++ are identical for every user, so this configures runtime/ like
-# LocalBuild.ps1 (both dot-source NativeBuildFlags.ps1), builds just that closure, and harvests the
-# archives plus a generated CMake description into launcher/artifacts/dependencies/native_prebuilt.
+# LocalBuild.ps1 (both dot-source NativeBuildFlags.ps1), builds just that closure plus the
+# game-independent runtime archive, and harvests the archives and a generated CMake description
+# into launcher/artifacts/dependencies/native_prebuilt.
 [CmdletBinding(PositionalBinding = $false)]
 param(
     [string]$PortableToolsDirectory = 'launcher/artifacts/portable-tools',
@@ -87,24 +88,29 @@ try {
         -AdditionalArguments @("-DMKW_NATIVE_PREBUILT_EXPORT_DIR=$(ConvertTo-MkwCMakePath $exportDirectory)")
     Invoke-Checked $cmake $configure 'Configuring the aurora/third-party staging build' -LogPrefix 'MKWNP'
 
+    $metaPath = Join-Path $exportDirectory 'meta.txt'
+    Assert-File $metaPath 'Native prebuilt export metadata'
+    $meta = @{}
+    foreach ($line in Get-Content -LiteralPath $metaPath) {
+        if ($line -match '^([a-z0-9_]+)=(.*)$') { $meta[$Matches[1]] = $Matches[2] }
+    }
+    # The game-independent runtime ships precompiled too; it is outside the probe closure.
+    if (-not $meta.ContainsKey('runtime_fingerprint')) {
+        throw 'The staging configure exported no runtime_fingerprint; the x86_64 package must carry the runtime archive.'
+    }
+
     # mkw_np_probe links exactly what mkw_runtime_common and the public products
     # link, so building it compiles the whole redistributable closure and nothing
     # else - and a successful link proves the harvested archives are complete.
-    Invoke-Checked $cmake @('--build', $stage, '--target', 'mkw_np_probe', '--parallel', "$Parallel") `
-        'Building the aurora/third-party closure' -LogPrefix 'MKWNP'
+    Invoke-Checked $cmake @('--build', $stage, '--target', 'mkw_np_probe', '--target', 'mkw_runtime',
+        '--parallel', "$Parallel") 'Building the aurora/third-party closure and the runtime' -LogPrefix 'MKWNP'
 } finally {
     $env:PATH = $oldPath
 }
 
 # ---------------------------------------------------------------------------
-# Read the description CMake wrote, plus the resolved command lines Ninja holds.
+# Read the resolved command lines Ninja holds.
 # ---------------------------------------------------------------------------
-$metaPath = Join-Path $exportDirectory 'meta.txt'
-Assert-File $metaPath 'Native prebuilt export metadata'
-$meta = @{}
-foreach ($line in Get-Content -LiteralPath $metaPath) {
-    if ($line -match '^([a-z0-9_]+)=(.*)$') { $meta[$Matches[1]] = $Matches[2] }
-}
 
 $buildNinja = Join-Path $stage 'build.ninja'
 Assert-File $buildNinja 'Generated build.ninja'
@@ -234,6 +240,12 @@ foreach ($name in ($targets.Keys | Sort-Object)) {
 }
 if ($sharedImports.Count -eq 0) { throw 'No shared libraries were harvested; the SDL/zlib/libpng DLLs would be missing.' }
 if ($dawnLinkerFile) { $linkerFileToReference[$dawnLinkerFile] = 'dawn::webgpu_dawn' }
+$runtimeTarget = $targets['mkw_runtime']
+if ($null -eq $runtimeTarget -or $runtimeTarget.Type -ne 'STATIC_LIBRARY' -or
+    -not $linkerFileToReference.ContainsKey($runtimeTarget.LinkerFile)) {
+    throw 'The runtime archive (mkw_runtime) was not built and harvested.'
+}
+$runtimeArchiveReference = $linkerFileToReference[$runtimeTarget.LinkerFile]
 
 # ---------------------------------------------------------------------------
 # Rewrite the compile/link interface into workspace-relative tokens.
@@ -297,6 +309,9 @@ $packageLinkItems = @($linkItems | ForEach-Object {
     if (StartsWithPath $absolute $dependencyRoot) { return "`@DEPS`@/$(RelativeTo $absolute $dependencyRoot)" }
     throw "Link item is neither a system library nor a harvested archive: $item"
 })
+if ($packageLinkItems -contains $runtimeArchiveReference) {
+    throw 'The runtime archive leaked into the aurora link interface.'
+}
 
 # fmt's `-include cstdlib` (and anything like it) is recorded from a C++ compile
 # line, so re-scope it to C++. The runtime also assembles generated .S blobs
@@ -333,6 +348,11 @@ $generated.Add('')
 $generated.Add("set(MKW_NP_DAWN_CONFIG_DIR `"$(ConvertTo-Token $meta['dawn_config_dir'] 'dawn')`")")
 $generated.Add("set(MKW_NP_DAWN_VERSION `"$($meta['aurora_dawn_version'])`")")
 $generated.Add('')
+$generated.Add('# The precompiled game-independent runtime; RuntimeLibrary.cmake decides whether it applies.')
+$generated.Add("set(MKW_NP_RUNTIME_ARCHIVE `"$runtimeArchiveReference`")")
+$generated.Add("set(MKW_NP_RUNTIME_FINGERPRINT `"$($meta['runtime_fingerprint'])`")")
+$generated.Add("set(MKW_NP_RUNTIME_CPU_PROFILE `"$($meta['runtime_cpu_profile'])`")")
+$generated.Add('')
 $generated.Add('# Shared third-party libraries keep imported SHARED targets so that')
 $generated.Add('# $<TARGET_RUNTIME_DLLS> still copies them next to the game executable.')
 foreach ($import in $sharedImports) {
@@ -393,6 +413,9 @@ $provenance = [ordered]@{
     # release build and the local build can refuse a package aurora has outgrown.
     AuroraSourceFingerprint = $auroraSourceFingerprint
     ThirdPartySourceFingerprint = $thirdPartySourceFingerprint
+    # runtime/cmake/RuntimeFingerprint.cmake over the runtime sources the archive was built from.
+    RuntimeSourceFingerprint = $meta['runtime_fingerprint']
+    RuntimeCpuProfile = $meta['runtime_cpu_profile']
     Sdl3Target = $meta['aurora_sdl3_target']
     HarvestedLibraryCount = @($linkerFileToReference.Keys).Count
     Contents = $contents

Launcher/Prepare-NativePrebuilt.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 # Builds the redistributable precompiled aurora + third-party package for native Linux: aurora
-# (~43% of local build CPU time per Prepare-NativePrebuilt.ps1) and vendored Crypto++ are identical
+# (~43% of local build CPU time per Prepare-NativePrebuilt.ps1), Crypto++ and mbed TLS are identical
 # for every user under the pinned toolchain prepare-portable-tools.sh bundles, so this configures
-# runtime/ against that toolchain, builds just that closure, and harvests the archives plus a
-# generated CMake description into an output package - the Linux counterpart to
+# runtime/ against that toolchain, builds just that closure (plus, on x86_64, the game-independent
+# runtime archive), and harvests the archives plus a generated CMake description into an output
+# package - the Linux counterpart to
 # Launcher/Prepare-NativePrebuilt.ps1, consumed by the same platform-agnostic
 # runtime/cmake/NativePrebuilt.cmake either script's package works with unmodified.
 #
@@ -22,11 +23,17 @@ workspace=$(cd "$script_dir/.." && pwd)
 
 arch=""
 output_dir=""
+toolchain_dir=""
+ninja_bin=""
+cmake_bin=""
+llvm_dir=""
+sysroot=""
 stage_dir="$workspace/build/native-prebuilt-stage"
 keep_stage=0
 reuse_stage=0
 parallel=0
 print_fingerprint_only=0
+disconnected=0
 
 usage() {
     cat <<'EOF'
@@ -39,8 +46,7 @@ Usage: Prepare-NativePrebuilt.sh --arch {x86_64|aarch64} [options]
   --reuse-stage           Reuse an existing staging build directory (maintainer iteration aid: a
                           re-harvest does not recompile aurora from scratch)
   --parallel N            Ninja build parallelism (default: nproc)
-  --print-fingerprint-only  Print the four provenance inputs (compiler_sha256, flag_fingerprint,
-                          aurora_fingerprint, third_party_fingerprint) as "key=value" lines and
+  --print-fingerprint-only  Print the provenance inputs as "key=value" lines and
                           exit, without configuring/building/harvesting anything - lets a caller
                           (build-appimage.sh) decide whether an existing package is still current
                           without paying for a full aurora rebuild just to find out.
@@ -56,6 +62,12 @@ while [[ $# -gt 0 ]]; do
         --reuse-stage) reuse_stage=1; shift ;;
         --parallel) parallel=$2; shift 2 ;;
         --print-fingerprint-only) print_fingerprint_only=1; shift ;;
+        --toolchain-dir) toolchain_dir=$2; shift 2 ;;
+        --ninja-bin) ninja_bin=$2; shift 2 ;;
+        --cmake-bin) cmake_bin=$2; shift 2 ;;
+        --llvm-dir) llvm_dir=$2; shift 2 ;;
+        --sysroot) sysroot=$2; shift 2 ;;
+        --disconnected) disconnected=1; shift ;;
         -h|--help) usage; exit 0 ;;
         *) echo "Prepare-NativePrebuilt.sh: unknown argument: $1" >&2; exit 1 ;;
     esac
@@ -72,14 +84,22 @@ assert_dir() { [[ -d "$1" ]] || fail "$2 is missing: $1"; }
 sha256_of() { sha256sum "$1" | awk '{print $1}'; }
 normalize() { readlink -f "$1"; }
 
+# Environment check: Ensure the `SOURCE_DATE_EPOCH` value is not invalid
+# before trying to build anything (fail-fast)
+if [[ -n "${SOURCE_DATE_EPOCH:-}" ]] && ! python3 -c \
+    'import datetime, os; datetime.datetime.fromtimestamp(int(os.environ.get("SOURCE_DATE_EPOCH")), datetime.timezone.utc)'
+then
+    fail "SOURCE_DATE_EPOCH must be a valid UNIX timestamp"
+fi
+
 [[ -n "$output_dir" ]] || output_dir="$script_dir/artifacts/native-prebuilt-$arch"
 [[ "$stage_dir" = /* ]] || stage_dir="$workspace/$stage_dir"
 
-toolchain_dir="$script_dir/artifacts/portable-tools/toolchain-$arch"
-cc="$toolchain_dir/bin/clang"
-cxx="$toolchain_dir/bin/clang++"
-cmake_bin="$toolchain_dir/bin/cmake"
-ninja_bin="$toolchain_dir/bin/ninja"
+toolchain_dir="${toolchain_dir:-$script_dir/artifacts/portable-tools/toolchain-$arch}"
+cc="${llvm_dir:-$toolchain_dir}/bin/clang"
+cxx="${llvm_dir:-$toolchain_dir}/bin/clang++"
+cmake_bin="${cmake_bin:-$toolchain_dir/bin/cmake}"
+ninja_bin="${ninja_bin:-$toolchain_dir/bin/ninja}"
 runtime_source="$workspace/runtime"
 aurora_source="$workspace/aurora-main"
 
@@ -88,7 +108,7 @@ assert_file "$ninja_bin" "Portable Ninja"
 assert_file "$cc" "Portable C compiler"
 assert_file "$cxx" "Portable C++ compiler"
 assert_dir "$aurora_source" "aurora-main source tree"
-clang_binary=$(normalize "$toolchain_dir/bin/clang-22")
+clang_binary=$(normalize "${llvm_dir:-$toolchain_dir}/bin/clang-22")
 assert_file "$clang_binary" "Portable clang driver binary"
 
 (( parallel > 0 )) || parallel=$(nproc)
@@ -98,7 +118,7 @@ fingerprint_tree() {
     local root=$1; shift
     root=$(normalize "$root")
     [[ -d "$root" ]] || return 0
-    local find_args=("$root")
+    local find_args=("$root" -name .git -prune -o)
     local ex
     for ex in "$@"; do find_args+=(-path "$root/$ex" -prune -o); done
     find_args+=(-type f -print)
@@ -131,6 +151,8 @@ fixed_configure_flags=(
     -DCMAKE_DISABLE_FIND_PACKAGE_absl=ON
     -DCMAKE_DISABLE_FIND_PACKAGE_PNG=ON
     -DCMAKE_DISABLE_FIND_PACKAGE_Freetype=ON
+    -DUSE_STATIC_MBEDTLS_LIBRARY=ON
+    -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
     # Freetype's own vendored CMakeLists.txt separately probes for system BZip2 (optional
     # bzip2-compressed-font support aurora-main never asked for) regardless of the Freetype
     # find_package disable above, since that only stops aurora's own outer find_package(Freetype)
@@ -141,6 +163,16 @@ fixed_configure_flags=(
     -DFT_DISABLE_BZIP2=ON
     -DCMAKE_POLICY_DEFAULT_CMP0168=NEW
 )
+if [[ "$disconnected" -eq 1 ]]; then
+    fixed_configure_flags+=(
+        -DFETCHCONTENT_FULLY_DISCONNECTED=ON
+    )
+fi
+if [[ -n "$sysroot" ]]; then
+    fixed_configure_flags+=(
+        -DCMAKE_SYSROOT="$sysroot"
+    )
+fi
 flag_fingerprint=$(printf '%s\n' "${fixed_configure_flags[@]}" | sha256sum | awk '{print $1}')
 
 # extern/ is excluded because the payload ships that tree separately (aurora-main/extern is bundled
@@ -148,19 +180,35 @@ flag_fingerprint=$(printf '%s\n' "${fixed_configure_flags[@]}" | sha256sum | awk
 aurora_fingerprint=$(fingerprint_tree "$aurora_source" extern build)
 [[ -n "$aurora_fingerprint" ]] || fail "The aurora source tree could not be fingerprinted: $aurora_source"
 
-# The harvested Crypto++ archive is consumed against this tree's headers, so it is fingerprinted
-# for the same reason as aurora above. No exclusions: unlike aurora's extern/, nothing under
-# runtime/third_party is shipped separately.
+# The harvested Crypto++ archive is consumed against this tree's headers, so it is fingerprinted.
 third_party_fingerprint=$(fingerprint_tree "$runtime_source/third_party")
 [[ -n "$third_party_fingerprint" ]] || fail "The vendored third-party tree could not be fingerprinted: $runtime_source/third_party"
+mbedtls_fingerprint=$(sha256_of "$runtime_source/cmake/MbedTLSPin.cmake")
 
-compiler_sha256=$(sha256_of "$clang_binary")
+compiler_sha256=$(sha256_of "$cc")
+cxx_sha256=$(sha256_of "$cxx")
+# Append the CXX SHA256 if it doesn't match the hash of CC
+if [[ "${cxx_sha256}" != "${compiler_sha256}" ]]; then
+    compiler_sha256="${compiler_sha256}:${cxx_sha256}"
+fi
+
+# The game-independent runtime ships precompiled on x86_64 only; aarch64 compiles it locally.
+runtime_fingerprint=""
+if [[ "$arch" == x86_64 ]]; then
+    runtime_fingerprint=$("$cmake_bin" -DMKW_RUNTIME_DIR="$runtime_source" \
+        -P "$runtime_source/cmake/RuntimeFingerprint.cmake" | sed -n 's/^runtime_fingerprint=\([0-9a-f]\{64\}\)$/\1/p')
+    [[ -n "$runtime_fingerprint" ]] || fail "RuntimeFingerprint.cmake printed no runtime fingerprint"
+fi
 
 if [[ "$print_fingerprint_only" -eq 1 ]]; then
     printf 'compiler_sha256=%s\n' "$compiler_sha256"
     printf 'flag_fingerprint=%s\n' "$flag_fingerprint"
     printf 'aurora_fingerprint=%s\n' "$aurora_fingerprint"
     printf 'third_party_fingerprint=%s\n' "$third_party_fingerprint"
+    printf 'mbedtls_fingerprint=%s\n' "$mbedtls_fingerprint"
+    if [[ -n "$runtime_fingerprint" ]]; then
+        printf 'runtime_fingerprint=%s\n' "$runtime_fingerprint"
+    fi
     exit 0
 fi
 
@@ -184,20 +232,30 @@ echo "Prepare-NativePrebuilt.sh: configuring the aurora/third-party staging buil
     -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
     -DMKW_NATIVE_PREBUILT_EXPORT_DIR="$export_dir"
 
-# mkw_np_probe links exactly what mkw_runtime_common and the public products link, so building it
-# compiles the whole redistributable closure and nothing else - and a successful link proves the
-# harvested archives are complete.
-echo "Prepare-NativePrebuilt.sh: building the aurora/third-party closure..."
-"$cmake_bin" --build "$stage_dir" --target mkw_np_probe --parallel "$parallel"
-
-# ---------------------------------------------------------------------------
-# Read the description CMake wrote, plus the resolved command lines Ninja holds.
-# ---------------------------------------------------------------------------
-
 meta_path="$export_dir/meta.txt"
 assert_file "$meta_path" "Native prebuilt export metadata"
 get_meta() { awk -F= -v k="$1" '$0 ~ "^" k "=" { sub(/^[^=]*=/, ""); print; exit }' "$meta_path"; }
 
+# mkw_np_probe links exactly what mkw_runtime_common and the public products link, so building it
+# compiles the whole redistributable closure and nothing else - and a successful link proves the
+# harvested archives are complete. The runtime archive is outside that closure and built alongside.
+build_targets=(--target mkw_np_probe)
+meta_runtime_fingerprint=$(get_meta runtime_fingerprint)
+if [[ -n "$meta_runtime_fingerprint" ]]; then
+    if [[ -n "$runtime_fingerprint" && "$meta_runtime_fingerprint" != "$runtime_fingerprint" ]]; then
+        fail "The configure's runtime fingerprint ($meta_runtime_fingerprint) differs from RuntimeFingerprint.cmake's ($runtime_fingerprint)"
+    fi
+    build_targets+=(--target mkw_runtime)
+elif [[ -n "$runtime_fingerprint" ]]; then
+    fail "The staging configure exported no runtime_fingerprint; the $arch package must carry the runtime archive"
+fi
+echo "Prepare-NativePrebuilt.sh: building the aurora/third-party closure..."
+"$cmake_bin" --build "$stage_dir" "${build_targets[@]}" --parallel "$parallel"
+
+# ---------------------------------------------------------------------------
+# Read the resolved command lines Ninja holds.
+# ---------------------------------------------------------------------------
+
 build_ninja="$stage_dir/build.ninja"
 assert_file "$build_ninja" "Generated build.ninja"
 
@@ -361,6 +419,28 @@ while IFS='|' read -r name type file linkerfile; do
         linker_file_to_reference["$linkerfile"]="@PKG@/$relative_linker"
     fi
 done < "$targets_txt"
+runtime_archive_ref=""
+if [[ -n "$meta_runtime_fingerprint" ]]; then
+    runtime_linker=$(awk -F'|' '$1 == "mkw_runtime" && $2 == "STATIC_LIBRARY" { print $4; exit }' "$targets_txt")
+    [[ -n "$runtime_linker" && -f "$runtime_linker" ]] || fail "The runtime archive (mkw_runtime) was not built"
+    runtime_archive_ref=${linker_file_to_reference["$(normalize "$runtime_linker")"]:-}
+    [[ "$runtime_archive_ref" == "@PKG@/lib/"* ]] || fail "The runtime archive (mkw_runtime) was not harvested"
+fi
+mbedtls_refs=()
+mbedtls_txt="$export_dir/mbedtls.txt"
+assert_file "$mbedtls_txt" "Mbed TLS export targets list"
+while IFS='|' read -r name linkerfile; do
+    [[ -n "$name" ]] || continue
+    linkerfile=$(normalize "$linkerfile")
+    ref=${linker_file_to_reference["$linkerfile"]:-}
+    [[ -n "$ref" ]] || fail "Mbed TLS archive was not harvested: $name ($linkerfile)"
+    mbedtls_refs+=("$ref")
+done < "$mbedtls_txt"
+[[ ${#mbedtls_refs[@]} -ge 3 ]] || fail "Expected at least three Mbed TLS archives, got ${#mbedtls_refs[@]}"
+mbedtls_source_dir=$(get_meta mbedtls_source_dir)
+assert_dir "$mbedtls_source_dir/include/mbedtls" "Mbed TLS headers"
+mkdir -p "$output_dir/include/mbedtls"
+cp -a "$mbedtls_source_dir/include/." "$output_dir/include/mbedtls/"
 # Unlike Windows (SDL/zlib/libpng ship as DLLs by default), everything here was forced static above
 # and Dawn's own Linux package (verified directly) ships libwebgpu_dawn.a, also static - so zero
 # shared imports is the expected, normal outcome, not a failure.
@@ -426,6 +506,9 @@ for item in "${link_items[@]}"; do
     if [[ "$item" = /* ]]; then item_abs=$(normalize "$item"); else item_abs=$(normalize "$stage_dir/$item"); fi
     ref=${linker_file_to_reference["$item_abs"]:-}
     if [[ -n "$ref" ]]; then
+        for mbedtls_ref in "${mbedtls_refs[@]}"; do
+            [[ "$ref" == "$mbedtls_ref" ]] && continue 2
+        done
         package_link_items+=("$ref")
         continue
     fi
@@ -444,6 +527,11 @@ for item in "${link_items[@]}"; do
     esac
     fail "Link item is neither a system library nor a harvested archive: $item"
 done
+if [[ -n "$runtime_archive_ref" ]]; then
+    for item in "${package_link_items[@]}"; do
+        [[ "$item" != "$runtime_archive_ref" ]] || fail "The runtime archive leaked into the aurora link interface"
+    done
+fi
 
 # ---------------------------------------------------------------------------
 # Emit the consumer-facing CMake description.
@@ -505,6 +593,15 @@ generated_cmake="$output_dir/native_prebuilt.cmake"
     format_cmake_block MKW_NP_COMPILE_DEFINITIONS "${package_definitions[@]}"
     format_cmake_block MKW_NP_COMPILE_OPTIONS "${package_compile_options[@]}"
     format_cmake_block MKW_NP_LINK_LIBRARIES "${package_link_items[@]}"
+    format_cmake_block MKW_NP_MBEDTLS_LIBRARIES "${mbedtls_refs[@]}"
+    echo 'set(MKW_NP_MBEDTLS_INCLUDE_DIR "@PKG@/include/mbedtls")'
+    printf 'set(MKW_NP_MBEDTLS_FINGERPRINT "%s")\n' "$mbedtls_fingerprint"
+    if [[ -n "$runtime_archive_ref" ]]; then
+        # The precompiled game-independent runtime; RuntimeLibrary.cmake decides whether it applies.
+        printf 'set(MKW_NP_RUNTIME_ARCHIVE "%s")\n' "$runtime_archive_ref"
+        printf 'set(MKW_NP_RUNTIME_FINGERPRINT "%s")\n' "$meta_runtime_fingerprint"
+        printf 'set(MKW_NP_RUNTIME_CPU_PROFILE "%s")\n' "$(get_meta runtime_cpu_profile)"
+    fi
     format_cmake_block MKW_NP_AURORA_TARGETS "aurora::gx" "aurora::pad" "aurora::si" "aurora::vi" "aurora::mtx"
     echo ""
     printf 'set(MKW_NP_DAWN_CONFIG_DIR "%s")\n' "$dawn_config_token"
@@ -540,12 +637,13 @@ harvested_count=${#linker_file_to_reference[@]}
 
 python3 - "$output_dir" "$compiler_sha256" "$compiler_version" "$flag_fingerprint" \
     "$dawn_version" "$dawn_runtime_sha256" "$aurora_fingerprint" "$third_party_fingerprint" \
-    "$sdl3_target" "$harvested_count" <<'PY'
+    "$sdl3_target" "$harvested_count" "$mbedtls_fingerprint" \
+    "${runtime_archive_ref:+$meta_runtime_fingerprint}" "${runtime_archive_ref:+$(get_meta runtime_cpu_profile)}" <<'PY'
 import hashlib, json, os, sys, datetime
 
 (output_dir, compiler_sha256, compiler_version, flag_fingerprint, dawn_version,
  dawn_runtime_sha256, aurora_fingerprint, third_party_fingerprint, sdl3_target,
- harvested_count) = sys.argv[1:]
+ harvested_count, mbedtls_fingerprint, runtime_fingerprint, runtime_cpu_profile) = sys.argv[1:]
 
 contents = []
 for root, dirs, files in os.walk(output_dir):
@@ -560,9 +658,21 @@ for root, dirs, files in os.walk(output_dir):
         contents.append({"Path": rel, "Bytes": os.path.getsize(path), "Sha256": digest})
 contents.sort(key=lambda c: c["Path"])
 
+source_date_epoch = os.environ.get("SOURCE_DATE_EPOCH") or None
+utc = datetime.timezone.utc
+if source_date_epoch is not None:
+    built_utc = datetime.datetime.fromtimestamp(
+        int(source_date_epoch),
+        utc
+    )
+else:
+    built_utc = datetime.datetime.now(utc)
+
+built_utc = built_utc.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+
 provenance = {
     "SchemaVersion": 1,
-    "BuiltUtc": datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
+    "BuiltUtc": built_utc,
     "CompilerSha256": compiler_sha256,
     "CompilerVersion": compiler_version,
     "FlagFingerprint": flag_fingerprint,
@@ -570,10 +680,14 @@ provenance = {
     "DawnRuntimeSha256": dawn_runtime_sha256,
     "AuroraSourceFingerprint": aurora_fingerprint,
     "ThirdPartySourceFingerprint": third_party_fingerprint,
+    "MbedTlsFingerprint": mbedtls_fingerprint,
     "Sdl3Target": sdl3_target,
     "HarvestedLibraryCount": int(harvested_count),
     "Contents": contents,
 }
+if runtime_fingerprint:
+    provenance["RuntimeSourceFingerprint"] = runtime_fingerprint
+    provenance["RuntimeCpuProfile"] = runtime_cpu_profile
 with open(os.path.join(output_dir, "provenance.json"), "w", encoding="utf-8") as fh:
     json.dump(provenance, fh, indent=2)
     fh.write("\n")

Launcher/Test-PinnedFacts.ps1

@@ -127,7 +127,7 @@ foreach ($mandatory in ([regex]::Matches($parameterBlock,
 }
 
 # --- The build steps the installer's progress bar acts on.
-$installProgress = Read-SourceFile (Join-Path $setup 'InstallProgress.cs') 'InstallProgress.cs'
+$installProgress = Read-SourceFile (Join-Path $common 'InstallProgress.cs') 'InstallProgress.cs'
 $knownSteps = Get-QuotedList $installProgress '(?s)class BuildStepIds\s*\{(.*?)\n\}' `
     'const string \w+ = "([^"]+)";' 'BuildStepIds'
 $emittedSteps = @([regex]::Matches($localBuild, "(?:-StepId|Write-MkwBuildStep)\s+'([^']+)'") |

Launcher/Test-Recompilation.ps1

@@ -36,8 +36,17 @@ Write-Host "Synthetic recompilation workspace: $stage"
 
 # Copy current sources, including uncommitted edits, but no ignored build output.
 # An isolated workspace preserves the developer's real generated/ directory.
-$sourceFiles = & git -C $repoRoot -c core.quotepath=false ls-files --cached --others --exclude-standard -- runtime aurora-main
-if ($LASTEXITCODE -ne 0) { throw 'Could not enumerate runtime and Aurora sources.' }
+$auroraRoot = Join-Path $repoRoot 'aurora-main'
+if (-not (Test-Path -LiteralPath (Join-Path $auroraRoot '.git'))) {
+    throw 'Aurora submodule is not initialized. Run git submodule update --init --recursive first.'
+}
+# The parent tracks Aurora as one gitlink; enumerate its repository separately.
+# Retain untracked source files so local development edits are still tested.
+$sourceFiles = @(& git -C $repoRoot -c core.quotepath=false ls-files --cached --others --exclude-standard -- runtime)
+if ($LASTEXITCODE -ne 0) { throw 'Could not enumerate runtime sources.' }
+$auroraFiles = @(& git -C $auroraRoot -c core.quotepath=false ls-files --cached --others --exclude-standard)
+if ($LASTEXITCODE -ne 0) { throw 'Could not enumerate Aurora sources.' }
+$sourceFiles += @($auroraFiles | ForEach-Object { "aurora-main/$_" })
 foreach ($relative in $sourceFiles | Sort-Object -Unique) {
     $destination = Join-Path $stage $relative
     [IO.Directory]::CreateDirectory([IO.Path]::GetDirectoryName($destination)) | Out-Null

Launcher/WiiCompiled.Setup.Common.Cli/WiiCompiled.Setup.Common.Cli.csproj

@@ -6,7 +6,6 @@
     <Nullable>enable</Nullable>
     <RootNamespace>WiiCompiled.Setup.Common.Cli</RootNamespace>
     <AssemblyName>WiiCompiled.Setup.Common.Cli</AssemblyName>
-    <Version>0.2.32</Version>
     <Authors>patchzy</Authors>
     <Product>WiiCompiled</Product>
     <Description>Packaging-time helper: resolves (downloading if needed) the nodtool binary bundled by build-appimage.sh and Build-Installer.ps1</Description>

Launcher/WiiCompiled.Setup.Common/InstallProgress.cs

@@ -1,35 +1,19 @@
 using System.Text.Json;
 
-namespace WiiCompiled.Setup.Windows;
-
-/// <summary>
-/// Stable stage identifiers reported by <c>--progress-json</c>. These are part of the public
-/// WheelWizard contract (docs/WHEELWIZARD_CONTRACT.md): the strings may gain new members, but an
-/// existing identifier never changes meaning.
-/// </summary>
-internal static class InstallStages
-{
-    public const string Validate = "validate";
-    public const string ExtractToolkit = "extract-toolkit";
-    public const string ExtractDisc = "extract-disc";
-    public const string PrepareRetro = "prepare-retro";
-    public const string BuildBase = "build-base";
-    public const string BuildRetro = "build-retro";
-    public const string Publish = "publish";
-}
+namespace WiiCompiled.Setup.Common;
 
 /// <summary>
 /// Where an installation reports what it is doing. Progress is coarse and monotonic; raw translator
 /// and compiler output is a diagnostic, never progress, because it is unbounded and machine-hostile.
 /// </summary>
-internal interface IInstallReporter
+public interface IInstallReporter
 {
     void Progress(string stage, string message, int percent);
     void Diagnostic(string line);
 }
 
 /// <summary>Reports to a caller-supplied sink; used by console and maintenance commands.</summary>
-internal sealed class DelegatingInstallReporter : IInstallReporter
+public sealed class DelegatingInstallReporter : IInstallReporter
 {
     private readonly Action<string> _sink;
 
@@ -43,15 +27,20 @@ internal sealed class DelegatingInstallReporter : IInstallReporter
 /// The <c>--progress-json</c> protocol: one JSON object per line on stdout, nothing else on stdout,
 /// diagnostics on stderr. The terminal <c>result</c> line is written exactly once.
 /// </summary>
-internal sealed class NdjsonInstallReporter : IInstallReporter
+public sealed class NdjsonInstallReporter : IInstallReporter
 {
     private static readonly JsonSerializerOptions Options = new() { WriteIndented = false };
+    private readonly string _version;
     private readonly Action<string>? _log;
     private readonly object _gate = new();
     private int _lastPercent;
     private bool _finished;
 
-    public NdjsonInstallReporter(Action<string>? log = null) => _log = log;
+    public NdjsonInstallReporter(string version, Action<string>? log = null)
+    {
+        _version = version;
+        _log = log;
+    }
 
     public void Progress(string stage, string message, int percent)
     {
@@ -78,7 +67,7 @@ internal sealed class NdjsonInstallReporter : IInstallReporter
         {
             if (_finished) return;
             _finished = true;
-            WriteLine(new { type = "result", success = true, version = ProductInfo.Version, installDir = installDirectory });
+            WriteLine(new { type = "result", success = true, version = _version, installDir = installDirectory });
         }
     }
 
@@ -106,8 +95,8 @@ internal sealed class NdjsonInstallReporter : IInstallReporter
     }
 }
 
-/// <summary>Plain-text console reporting for a silent install without <c>--progress-json</c>.</summary>
-internal sealed class ConsoleInstallReporter : IInstallReporter
+/// <summary>Plain-text console reporting for a run without <c>--progress-json</c>.</summary>
+public sealed class ConsoleInstallReporter : IInstallReporter
 {
     private readonly Action<string>? _log;
 
@@ -126,10 +115,10 @@ internal sealed class ConsoleInstallReporter : IInstallReporter
     }
 }
 
-/// <summary>Build step identifiers from the bundled script's <c>MKWCBUILD:STEP:&lt;id&gt;</c> lines. The
+/// <summary>Build step identifiers from the build scripts' <c>MKWCBUILD:STEP:&lt;id&gt;</c> lines. The
 /// id is the contract; LocalBuild.ps1 emits these exactly and Test-PinnedFacts.ps1 fails the release if
 /// the two sets disagree, so progress never depends on matching reworded English prose.</summary>
-internal static class BuildStepIds
+public static class BuildStepIds
 {
     public const string ReuseBaseTranslation = "reuse-base-translation";
     public const string RetranslateBase = "retranslate-base";
@@ -143,16 +132,16 @@ internal static class BuildStepIds
 }
 
 /// <summary>
-/// Maps one local translate-and-compile run onto a slice of the overall percentage. The bundled
-/// build script announces every step it starts with an <c>MKWCBUILD:</c> prefix, so the slice can
-/// advance on real events instead of on a timer.
+/// Maps one local translate-and-compile run onto a slice of the overall percentage. The build
+/// scripts announce every step they start with an <c>MKWCBUILD:</c> prefix, so the slice can advance
+/// on real events instead of on a timer.
 /// </summary>
-internal sealed class BuildProgressWindow
+public sealed class BuildProgressWindow
 {
     private const string Marker = "MKWCBUILD:";
     private const string StepMarker = "STEP:";
 
-    /// <summary>The fraction the compile step reaches; beyond it, compiler output is a heartbeat.</summary>
+    /// <summary>The fraction the compile step reaches; beyond it, Ninja's counter drives progress.</summary>
     private const double CompileFraction = 0.58;
 
     private static readonly (string Id, double Fraction, string Message)[] Steps =
@@ -164,7 +153,7 @@ internal sealed class BuildProgressWindow
         (BuildStepIds.TranslateMod, 0.38, "Translating the Retro Rewind Code.pul"),
         (BuildStepIds.GenerateDataInit, 0.44, "Generating game data initialization"),
         (BuildStepIds.EmitBuildShards, 0.48, "Preparing the native build"),
-        (BuildStepIds.ConfigureNative, 0.52, "Configuring the bundled compiler"),
+        (BuildStepIds.ConfigureNative, 0.52, "Configuring the compiler"),
         (BuildStepIds.Compile, CompileFraction, "Compiling the game. This is the longest step"),
     ];
 
@@ -209,19 +198,30 @@ internal sealed class BuildProgressWindow
             }
         }
 
-        // Anything else - an unknown step identifier from a newer script, a plain MKWCBUILD note, or
-        // raw tool output - stays a diagnostic and only feeds the heartbeat below.
+        // Anything else - an unknown step identifier, a plain MKWCBUILD note, or raw tool output -
+        // stays a diagnostic.
         _reporter.Diagnostic(line);
-        // Compilation announces itself once and then emits thousands of compiler lines. Treat that
-        // output as a heartbeat so the slice keeps creeping forward, but only publish a progress
-        // line when the rounded percentage actually changes.
-        if (_fraction >= CompileFraction)
+        // Ninja prefixes every edge with [done/total]; how many edges there are depends on how much
+        // of the build is already up to date, so follow the counter rather than counting lines.
+        if (_fraction >= CompileFraction && TryParseNinjaProgress(line, out var done, out var total))
         {
-            _fraction = Math.Min(0.97, _fraction + 0.0015);
+            _fraction = Math.Max(_fraction, CompileFraction + (0.97 - CompileFraction) * done / total);
             Emit();
         }
     }
 
+    private static bool TryParseNinjaProgress(string line, out int done, out int total)
+    {
+        done = total = 0;
+        if (!line.StartsWith('[')) return false;
+        var close = line.IndexOf(']');
+        var slash = line.IndexOf('/');
+        return close > 0 && slash > 0 && slash < close
+            && int.TryParse(line.AsSpan(1, slash - 1), out done)
+            && int.TryParse(line.AsSpan(slash + 1, close - slash - 1), out total)
+            && total > 0 && done <= total;
+    }
+
     private void Emit()
     {
         var percent = Interpolate(_fraction);

Launcher/WiiCompiled.Setup.Common/RuntimeConfiguration.cs

@@ -1,4 +1,7 @@
 using System.Text;
+using Tomlyn;
+using Tomlyn.Parsing;
+using Tomlyn.Syntax;
 
 namespace WiiCompiled.Setup.Common;
 
@@ -17,12 +20,6 @@ public static class RuntimeConfiguration
 {
     public const string ConfigFileName = "Config.toml";
 
-    /// <summary>
-    /// Ordinal, matching the runtime parser/writer (<c>runtime_config.h</c>) exactly. Case-insensitive
-    /// matching here would let setup rewrite a <c>[Paths]</c>/<c>Dvd_Root</c> spelling the runtime ignores.
-    /// </summary>
-    private const StringComparison KeyComparison = StringComparison.Ordinal;
-
     /// <summary>The per-user configuration an ordinary (non-portable) installation shares.</summary>
     public static string ApplicationDataConfigPath => Path.Combine(
         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
@@ -75,9 +72,11 @@ public static class RuntimeConfiguration
     public static void RemoveDvdRootIfOwned(string configPath, string dvdRoot) =>
         RemovePathIfOwned(configPath, "dvd_root", dvdRoot);
 
-    /// <summary>The raw stored text of a <c>[paths]</c> key, exactly as the file holds it.</summary>
+    /// <summary>The stored string of a <c>[paths]</c> key, exactly as the file holds it.</summary>
     public static string? GetPath(string configPath, string key) =>
-        TryUnquoteToml(GetRawValue(configPath, "paths", key) ?? "", out var value) ? value : null;
+        TryLoad(configPath) is { } document && Find(document, ["paths"], key)?.Item.Value is StringValueSyntax value
+            ? value.Value!
+            : null;
 
     /// <summary>
     /// A <c>[paths]</c> value as the runtime will actually use it. The runtime resolves every relative
@@ -99,9 +98,19 @@ public static class RuntimeConfiguration
 
     private static void SetPath(string configPath, string key, string value)
     {
-        var lines = ReadLinesOrDefault(configPath);
-        SetSectionValue(lines, "paths", key, QuoteToml(FormatPathValue(configPath, value)));
-        WriteLines(configPath, lines);
+        var document = Parse(File.Exists(configPath) ? File.ReadAllText(configPath) : DefaultConfig);
+        var section = new[] { "paths" };
+        var newValue = new StringValueSyntax(FormatPathValue(configPath, value));
+        if (Find(document, section, key) is { } existing)
+        {
+            LastToken(newValue).TrailingTrivia = LastToken(existing.Item.Value!).TrailingTrivia;
+            existing.Item.Value = newValue;
+        }
+        else
+        {
+            Append(document, section, new KeyValueSyntax(key, newValue));
+        }
+        Save(configPath, document);
     }
 
     /// <summary>
@@ -123,176 +132,104 @@ public static class RuntimeConfiguration
 
     private static void RemovePathIfOwned(string configPath, string key, string expectedValue)
     {
-        if (!File.Exists(configPath)) return;
-        var lines = File.ReadAllLines(configPath).ToList();
-        var inPaths = false;
-        var changed = false;
-        for (var index = 0; index < lines.Count; index++)
-        {
-            var trimmed = RemoveComment(lines[index]).Trim();
-            if (IsSection(trimmed))
-            {
-                inPaths = trimmed.Equals("[paths]", KeyComparison);
-                continue;
-            }
-            if (!inPaths || trimmed.Length == 0) continue;
-            var equals = trimmed.IndexOf('=');
-            if (equals < 0 || !trimmed[..equals].Trim().Equals(key, KeyComparison))
-                continue;
-            if (!TryUnquoteToml(trimmed[(equals + 1)..].Trim(), out var configured)) return;
-            // A portable installation stores this relative, so ownership is decided on the path the
-            // runtime would actually resolve, not on the stored text.
-            if (!ResolveAgainstConfig(configPath, configured)
-                    .Equals(Path.GetFullPath(expectedValue), StringComparison.OrdinalIgnoreCase))
-                return;
-            lines.RemoveAt(index);
-            changed = true;
-            break;
-        }
-        if (changed) WriteLines(configPath, lines);
+        if (TryLoad(configPath) is not { } document ||
+            Find(document, ["paths"], key) is not { } entry ||
+            entry.Item.Value is not StringValueSyntax configured)
+            return;
+        // A portable installation stores this relative, so ownership is decided on the path the
+        // runtime would actually resolve, not on the stored text.
+        if (!ResolveAgainstConfig(configPath, configured.Value!)
+                .Equals(Path.GetFullPath(expectedValue), StringComparison.OrdinalIgnoreCase))
+            return;
+        var previous = entry.Previous?.EndOfLineToken ?? entry.Table?.EndOfLineToken;
+        if (previous is not null && entry.Item.EndOfLineToken?.TrailingTrivia is { } trivia)
+            (previous.TrailingTrivia ??= []).AddRange(trivia);
+        entry.Items.RemoveChild(entry.Item);
+        Save(configPath, document);
     }
 
-    /// <summary>The raw TOML literal stored for a key, or null when the section or key is absent.</summary>
-    public static string? GetRawValue(string configPath, string section, string key)
+    private const string DefaultConfig = "# WiiCompiled user configuration\n\n";
+
+    private sealed record Entry(
+        KeyValueSyntax Item, SyntaxList<KeyValueSyntax> Items, TableSyntax? Table, KeyValueSyntax? Previous);
+
+    private static DocumentSyntax Parse(string text) => SyntaxParser.ParseStrict(text);
+
+    private static DocumentSyntax? TryLoad(string configPath)
     {
         if (!File.Exists(configPath)) return null;
-        var header = $"[{section}]";
-        var inSection = false;
-        foreach (var line in File.ReadLines(configPath))
+        try { return Parse(File.ReadAllText(configPath)); }
+        catch (TomlException) { return null; }
+    }
+
+    /// <summary>Re-parses the edited tree before replacing the file, so an invalid edit never reaches disk.</summary>
+    private static void Save(string configPath, DocumentSyntax document)
+    {
+        var text = document.ToString();
+        Parse(text);
+        FileSystemUtilities.WriteAtomic(configPath, new UTF8Encoding(false).GetBytes(text));
+    }
+
+    private static IEnumerable<TableSyntax> Tables(DocumentSyntax document) =>
+        document.Tables.OfType<TableSyntax>();
+
+    private static string[] Parts(KeySyntax key) =>
+        [Part(key.Key!), .. key.DotKeys.Select(dotted => Part(dotted.Key!))];
+
+    private static string Part(BareKeyOrStringValueSyntax part) =>
+        part is StringValueSyntax quoted ? quoted.Value! : ((BareKeySyntax)part).Key!.Text!;
+
+    /// <summary>Matches by TOML meaning, so <c>"dvd_root"</c> and <c>dvd_root</c> are the same key.</summary>
+    private static Entry? Find(DocumentSyntax document, string[] section, string key)
+    {
+        string[] wanted = [.. section, key];
+        var scopes = Tables(document)
+            .Select(table => (Table: (TableSyntax?)table, Prefix: Parts(table.Name!), Items: table.Items))
+            .Prepend((Table: null, Prefix: [], Items: document.KeyValues));
+        foreach (var (table, prefix, items) in scopes)
         {
-            var trimmed = RemoveComment(line).Trim();
-            if (IsSection(trimmed))
+            KeyValueSyntax? previous = null;
+            foreach (var item in items)
             {
-                inSection = trimmed.Equals(header, KeyComparison);
-                continue;
+                if (prefix.Concat(Parts(item.Key!)).SequenceEqual(wanted))
+                    return new Entry(item, items, table, previous);
+                previous = item;
             }
-            if (!inSection || trimmed.Length == 0) continue;
-            var equals = trimmed.IndexOf('=');
-            if (equals < 0 || !trimmed[..equals].Trim().Equals(key, KeyComparison)) continue;
-            return trimmed[(equals + 1)..].Trim();
         }
         return null;
     }
 
-    /// <summary>
-    /// Replaces one key in one section, preserving comments, ordering, and every unrelated setting -
-    /// this file belongs to the user and to the in-game settings bar as much as to setup. A
-    /// commented-out key is deliberately not matched, matching the runtime's own writer.
-    /// </summary>
-    private static void SetSectionValue(List<string> lines, string section, string key, string value)
+    private static void Append(DocumentSyntax document, string[] section, KeyValueSyntax item)
     {
-        var header = $"[{section}]";
-        var sectionStart = -1;
-        var sectionEnd = lines.Count;
-        for (var index = 0; index < lines.Count; index++)
+        var text = document.ToString();
+        var newline = text.Contains("\r\n") ? "\r\n" : "\n";
+        var table = Tables(document).FirstOrDefault(t => Parts(t.Name!).SequenceEqual(section));
+        if (table is null)
         {
-            var trimmed = RemoveComment(lines[index]).Trim();
-            if (!IsSection(trimmed)) continue;
-            if (sectionStart >= 0)
-            {
-                sectionEnd = index;
-                break;
-            }
-            if (trimmed.Equals(header, KeyComparison)) sectionStart = index;
-        }
-        if (sectionStart < 0)
-        {
-            if (lines.Count > 0 && lines[^1].Length != 0) lines.Add("");
-            lines.Add(header);
-            lines.Add($"{key} = {value}");
-            return;
+            var name = new KeySyntax(section[0]);
+            foreach (var part in section.Skip(1)) name.DotKeys.Add(new DottedKeyItemSyntax(part));
+            table = new TableSyntax(name) { EndOfLineToken = NewLine(newline) };
+            var blankLine = text.EndsWith("\n\n") || text.EndsWith("\n\r\n");
+            var gap = text.Length == 0 ? 0 : !text.EndsWith('\n') ? 2 : blankLine ? 0 : 1;
+            for (var i = 0; i < gap; i++) (table.LeadingTrivia ??= []).Add(new SyntaxTrivia(TokenKind.NewLine, newline));
+            document.Tables.Add(table);
         }
 
-        for (var index = sectionStart + 1; index < sectionEnd; index++)
-        {
-            var trimmed = RemoveComment(lines[index]).Trim();
-            if (trimmed.Length == 0) continue;
-            var equals = trimmed.IndexOf('=');
-            if (equals >= 0 && trimmed[..equals].Trim().Equals(key, KeyComparison))
-            {
-                lines[index] = $"{key} = {value}";
-                return;
-            }
-        }
-
-        // Append after the section's last real line, not after the blank line that separates it from
-        // the next header, so a generated file stays readable for the user who also edits it by hand.
-        var insertAt = sectionEnd;
-        while (insertAt > sectionStart + 1 && lines[insertAt - 1].Trim().Length == 0) insertAt--;
-        lines.Insert(insertAt, $"{key} = {value}");
+        // Blank lines and comments after the last entry stay after the new one.
+        var last = table.Items.LastOrDefault();
+        var before = last is null ? table.EndOfLineToken ??= NewLine(newline) : last.EndOfLineToken ??= NewLine(newline);
+        item.EndOfLineToken = NewLine(newline);
+        item.EndOfLineToken.TrailingTrivia = before.TrailingTrivia;
+        before.TrailingTrivia = null;
+        table.Items.Add(item);
     }
 
-    private static List<string> ReadLinesOrDefault(string configPath) =>
-        File.Exists(configPath) ? File.ReadAllLines(configPath).ToList() : DefaultConfigLines();
+    private static SyntaxToken NewLine(string text) => new(TokenKind.NewLine, text);
 
-    private static void WriteLines(string configPath, List<string> lines) =>
-        FileSystemUtilities.WriteAtomic(configPath,
-            Encoding.UTF8.GetBytes(string.Join(Environment.NewLine, lines) + Environment.NewLine));
-
-    private static List<string> DefaultConfigLines() =>
-    [
-        "# WiiCompiled user configuration",
-        "",
-        "[paths]"
-    ];
-
-    private static bool IsSection(string value) =>
-        value.Length >= 2 && value[0] == '[' && value[^1] == ']';
-
-    /// <summary>
-    /// Line-for-line port of <c>RemoveComment</c> in <c>runtime_config.h</c>, including its backslash
-    /// escaping inside basic strings: without it a Windows path ending in <c>\\"</c> reads as
-    /// re-opening the quote, and the two implementations disagree about which <c>#</c> starts a comment.
-    /// </summary>
-    private static string RemoveComment(string line)
+    private static SyntaxToken LastToken(SyntaxNode node)
     {
-        var inSingle = false;
-        var inDouble = false;
-        var escaped = false;
-        for (var index = 0; index < line.Length; index++)
-        {
-            var character = line[index];
-            if (inDouble && character == '\\' && !escaped)
-            {
-                escaped = true;
-                continue;
-            }
-            if (character == '\'' && !inDouble) inSingle = !inSingle;
-            else if (character == '"' && !inSingle && !escaped) inDouble = !inDouble;
-            else if (character == '#' && !inSingle && !inDouble) return line[..index];
-            escaped = false;
-        }
-        return line;
-    }
-
-    private static string QuoteToml(string value) =>
-        "\"" + value.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
-
-    public static bool TryUnquoteToml(string value, out string result)
-    {
-        result = "";
-        if (value.Length < 2) return false;
-        // Literal strings carry no escapes; the runtime's parser treats them the same way.
-        if (value[0] == '\'' && value[^1] == '\'')
-        {
-            result = value[1..^1];
-            return true;
-        }
-        if (value[0] != '"' || value[^1] != '"') return false;
-        var builder = new StringBuilder(value.Length - 2);
-        for (var index = 1; index < value.Length - 1; index++)
-        {
-            if (value[index] == '\\' && index + 1 < value.Length - 1)
-            {
-                var escaped = value[++index];
-                builder.Append(escaped switch { '\\' => '\\', '"' => '"', _ => escaped });
-            }
-            else
-            {
-                builder.Append(value[index]);
-            }
-        }
-        result = builder.ToString();
-        return true;
+        while (node is not SyntaxToken)
+            node = node.GetChild(node.ChildrenCount - 1)!;
+        return (SyntaxToken)node;
     }
 }

Launcher/WiiCompiled.Setup.Common/WiiCompiled.Setup.Common.csproj

@@ -5,11 +5,13 @@
     <Nullable>enable</Nullable>
     <RootNamespace>WiiCompiled.Setup.Common</RootNamespace>
     <AssemblyName>WiiCompiled.Setup.Common</AssemblyName>
-    <Version>0.2.32</Version>
     <Authors>patchzy</Authors>
     <Product>WiiCompiled</Product>
     <Description>Shared nodtool/Retro-WFC-payload logic used by both the Windows and Linux installers</Description>
     <DebugType>embedded</DebugType>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Tomlyn" Version="2.10.1" />
+  </ItemGroup>
 </Project>

Launcher/WiiCompiled.Setup.Linux/BuildRunner.cs

@@ -82,6 +82,7 @@ internal static class BuildRunner
         {
             startInfo.ArgumentList.Add("--sysroot"); startInfo.ArgumentList.Add(sysroot);
         }
+        startInfo.ArgumentList.Add("--setup-version"); startInfo.ArgumentList.Add(ProductInfo.Version);
 
         using var process = new Process { StartInfo = startInfo };
         var window = new BuildProgressWindow(reporter, InstallStages.Build, start: 6, end: 96);

Launcher/WiiCompiled.Setup.Linux/DiscTool.cs

@@ -15,6 +15,12 @@ internal static class DiscTool
         string isoPath, ProjectManifest manifest, string assetsDirectory, string workspace,
         string? nodToolBin, IInstallReporter reporter, CancellationToken cancellationToken)
     {
+        if (IsAlreadyExtracted(manifest, assetsDirectory))
+        {
+            reporter.Progress(InstallStages.ExtractDisc, "Reusing the verified extracted disc", 6);
+            return;
+        }
+
         var nodTool = nodToolBin ?? await NodToolProvider.ResolveAsync(workspace, cancellationToken);
 
         // `nodtool info` only decodes the disc/partition headers (milliseconds); `nodtool extract`
@@ -35,6 +41,8 @@ internal static class DiscTool
         // time, so it has to survive past this install (see Program.cs, which points dvd_root here).
         reporter.Progress(InstallStages.ExtractDisc, "Extracting the disc image", 4);
         var dataDir = Path.Combine(assetsDirectory, "DATA");
+        Directory.CreateDirectory(assetsDirectory);
+        File.Delete(Path.Combine(assetsDirectory, ExtractionMarker));
         if (Directory.Exists(dataDir)) Directory.Delete(dataDir, recursive: true);
         await RunExtractAsync(nodTool, isoPath, dataDir, cancellationToken);
 
@@ -61,6 +69,7 @@ internal static class DiscTool
         Directory.CreateDirectory(assetsDirectory);
         File.Copy(dolPath, Path.Combine(assetsDirectory, "main.dol"), overwrite: true);
         File.Copy(relPath, Path.Combine(assetsDirectory, "StaticR.rel"), overwrite: true);
+        File.WriteAllText(Path.Combine(assetsDirectory, ExtractionMarker), ExtractionRecord(dolSha, dataDir));
         reporter.Progress(InstallStages.ExtractDisc, "Disc validated and extracted", 6);
     }
 
@@ -86,6 +95,36 @@ internal static class DiscTool
         return stdout;
     }
 
+    private const string ExtractionMarker = ".disc-extracted";
+
+    // Only one disc revision is accepted, so a completed, verified extraction is identical to a fresh one.
+    private static bool IsAlreadyExtracted(ProjectManifest manifest, string assetsDirectory)
+    {
+        var marker = Path.Combine(assetsDirectory, ExtractionMarker);
+        var dol = Path.Combine(assetsDirectory, "main.dol");
+        var rel = Path.Combine(assetsDirectory, "StaticR.rel");
+        var dataDir = Path.Combine(assetsDirectory, "DATA");
+        if (!File.Exists(marker) || !File.Exists(dol) || !File.Exists(rel) ||
+            !Directory.Exists(Path.Combine(dataDir, "files")))
+            return false;
+        return string.Equals(File.ReadAllText(marker), ExtractionRecord(manifest.DolSha256, dataDir),
+                   StringComparison.Ordinal) &&
+               string.Equals(Sha256Of(dol), manifest.DolSha256, StringComparison.Ordinal) &&
+               string.Equals(Sha256Of(rel), manifest.RelSha256, StringComparison.Ordinal);
+    }
+
+    // The DOL hash plus every extracted file's path and size, so a later deletion or truncation inside
+    // DATA forces a fresh extraction.
+    private static string ExtractionRecord(string dolSha, string dataDir)
+    {
+        var record = new System.Text.StringBuilder(dolSha).Append('\n');
+        foreach (var path in Directory.EnumerateFiles(dataDir, "*", SearchOption.AllDirectories)
+                     .Select(path => Path.GetRelativePath(dataDir, path).Replace('\\', '/'))
+                     .Order(StringComparer.Ordinal))
+            record.Append(new FileInfo(Path.Combine(dataDir, path)).Length).Append(' ').Append(path).Append('\n');
+        return record.ToString();
+    }
+
     private static string Sha256Of(string path)
     {
         using var stream = File.OpenRead(path);

Launcher/WiiCompiled.Setup.Linux/InstallProgress.cs

@@ -1,209 +0,0 @@
-using System.Text.Json;
-
-namespace WiiCompiled.Setup.Linux;
-
-// Ported near-verbatim from Launcher/WiiCompiled.Setup/InstallProgress.cs: this whole file is
-// platform-neutral (System.Text.Json + Console only), so the NDJSON --progress-json wire protocol
-// stays byte-for-byte the same shape a future GUI already speaks on Windows.
-
-/// <summary>
-/// Stable stage identifiers reported by <c>--progress-json</c>. Kept intentionally small for this
-/// lean Linux installer (no toolkit-extraction/publish-transaction stages, since there is no
-/// bundled toolkit or staged workspace copy here - see the plan's "operate on a git checkout"
-/// scoping decision).
-/// </summary>
-internal static class InstallStages
-{
-    public const string Validate = "validate";
-    public const string ExtractDisc = "extract-disc";
-    public const string Build = "build";
-    public const string Shortcuts = "shortcuts";
-}
-
-/// <summary>
-/// Where an installation reports what it is doing. Progress is coarse and monotonic; raw translator
-/// and compiler output is a diagnostic, never progress, because it is unbounded and machine-hostile.
-/// </summary>
-internal interface IInstallReporter
-{
-    void Progress(string stage, string message, int percent);
-    void Diagnostic(string line);
-}
-
-/// <summary>
-/// The <c>--progress-json</c> protocol: one JSON object per line on stdout, nothing else on stdout,
-/// diagnostics on stderr. The terminal <c>result</c> line is written exactly once.
-/// </summary>
-internal sealed class NdjsonInstallReporter : IInstallReporter
-{
-    private static readonly JsonSerializerOptions Options = new() { WriteIndented = false };
-    private readonly object _gate = new();
-    private int _lastPercent;
-    private bool _finished;
-
-    public void Progress(string stage, string message, int percent)
-    {
-        lock (_gate)
-        {
-            if (_finished) return;
-            // Percentages are clamped monotonic: a caller's progress bar must never walk backwards
-            // because a later stage happened to estimate a lower number.
-            _lastPercent = Math.Clamp(Math.Max(percent, _lastPercent), 0, 99);
-            WriteLine(new { type = "progress", stage, message, percent = _lastPercent });
-        }
-    }
-
-    public void Diagnostic(string line) => Console.Error.WriteLine(line);
-
-    public void Success(string installDirectory)
-    {
-        lock (_gate)
-        {
-            if (_finished) return;
-            _finished = true;
-            WriteLine(new { type = "result", success = true, version = ProductInfo.Version, installDir = installDirectory });
-        }
-    }
-
-    public void Failure(string error)
-    {
-        lock (_gate)
-        {
-            if (_finished) return;
-            _finished = true;
-            WriteLine(new { type = "result", success = false, error });
-        }
-    }
-
-    /// <summary>
-    /// The terminal result line is the caller's only completion signal, so no exit path may skip it.
-    /// Callers invoke this from a finally block; it is a no-op once a result was already written.
-    /// </summary>
-    public void EnsureFinished(string errorIfUnfinished) => Failure(errorIfUnfinished);
-
-    private static void WriteLine(object value)
-    {
-        Console.Out.WriteLine(JsonSerializer.Serialize(value, Options));
-        Console.Out.Flush();
-    }
-}
-
-/// <summary>Plain-text console reporting for a run without <c>--progress-json</c>.</summary>
-internal sealed class ConsoleInstallReporter : IInstallReporter
-{
-    public void Progress(string stage, string message, int percent) =>
-        Console.Out.WriteLine($"[{percent,3}%] {message}");
-
-    public void Diagnostic(string line) => Console.Out.WriteLine(line);
-}
-
-/// <summary>
-/// Build step identifiers from local-build.sh's <c>MKWCBUILD:STEP:&lt;id&gt;</c> lines - the id is
-/// the contract, matched against Launcher/local-build.sh's log_step() call sites.
-/// </summary>
-internal static class BuildStepIds
-{
-    public const string BuildTranslator = "build-translator";
-    public const string ReuseBaseTranslation = "reuse-base-translation";
-    public const string RetranslateBase = "retranslate-base";
-    public const string TranslateBase = "translate-base";
-    public const string EmitBaseManifest = "emit-base-manifest";
-    public const string TranslateMod = "translate-mod";
-    public const string GenerateDataInit = "generate-data-init";
-    public const string EmitBuildShards = "emit-build-shards";
-    public const string ConfigureNative = "configure-native";
-    public const string Compile = "compile";
-}
-
-/// <summary>
-/// Maps one local-build.sh run onto a slice of the overall percentage. local-build.sh announces
-/// every step it starts with an <c>MKWCBUILD:</c> prefix, so the slice can advance on real events
-/// instead of on a timer.
-/// </summary>
-internal sealed class BuildProgressWindow
-{
-    private const string Marker = "MKWCBUILD:";
-    private const string StepMarker = "STEP:";
-
-    /// <summary>The fraction the compile step reaches; beyond it, compiler output is a heartbeat.</summary>
-    private const double CompileFraction = 0.58;
-
-    private static readonly (string Id, double Fraction, string Message)[] Steps =
-    [
-        (BuildStepIds.BuildTranslator, 0.04, "Building the translator"),
-        (BuildStepIds.ReuseBaseTranslation, 0.30, "Reusing the completed base translation"),
-        (BuildStepIds.RetranslateBase, 0.08, "The base translation is stale; retranslating it"),
-        (BuildStepIds.TranslateBase, 0.10, "Translating Mario Kart Wii"),
-        (BuildStepIds.EmitBaseManifest, 0.34, "Creating the translation manifest"),
-        (BuildStepIds.TranslateMod, 0.38, "Translating the Retro Rewind Code.pul"),
-        (BuildStepIds.GenerateDataInit, 0.44, "Generating game data initialization"),
-        (BuildStepIds.EmitBuildShards, 0.48, "Preparing the native build"),
-        (BuildStepIds.ConfigureNative, 0.52, "Configuring the compiler"),
-        (BuildStepIds.Compile, CompileFraction, "Compiling the game. This is the longest step"),
-    ];
-
-    private readonly IInstallReporter _reporter;
-    private readonly string _stage;
-    private readonly int _start;
-    private readonly int _end;
-    private double _fraction;
-    private string _message = "Preparing the local build";
-    private int _reportedPercent = -1;
-
-    public BuildProgressWindow(IInstallReporter reporter, string stage, int start, int end)
-    {
-        _reporter = reporter;
-        _stage = stage;
-        _start = start;
-        _end = end;
-    }
-
-    public void Observe(string line)
-    {
-        var index = line.IndexOf(Marker, StringComparison.Ordinal);
-        if (index >= 0)
-        {
-            var text = line[(index + Marker.Length)..].Trim();
-            if (text.StartsWith(StepMarker, StringComparison.Ordinal))
-            {
-                var identifier = text[StepMarker.Length..];
-                var end = identifier.IndexOf(' ');
-                if (end >= 0) identifier = identifier[..end];
-                foreach (var (id, fraction, message) in Steps)
-                {
-                    if (!id.Equals(identifier, StringComparison.Ordinal)) continue;
-                    if (fraction > _fraction)
-                    {
-                        _fraction = fraction;
-                        _message = message;
-                        Emit();
-                    }
-                    return;
-                }
-            }
-        }
-
-        // Anything else - a plain MKWCBUILD note, or raw tool output - stays a diagnostic and only
-        // feeds the heartbeat below.
-        _reporter.Diagnostic(line);
-        // Compilation announces itself once and then emits thousands of compiler lines. Treat that
-        // output as a heartbeat so the slice keeps creeping forward, but only publish a progress
-        // line when the rounded percentage actually changes.
-        if (_fraction >= CompileFraction)
-        {
-            _fraction = Math.Min(0.97, _fraction + 0.0015);
-            Emit();
-        }
-    }
-
-    private void Emit()
-    {
-        var percent = Interpolate(_fraction);
-        if (percent == _reportedPercent) return;
-        _reportedPercent = percent;
-        _reporter.Progress(_stage, _message, percent);
-    }
-
-    private int Interpolate(double fraction) =>
-        (int)Math.Round(_start + (_end - _start) * Math.Clamp(fraction, 0, 1));
-}

Launcher/WiiCompiled.Setup.Linux/InstallStages.cs

@@ -0,0 +1,10 @@
+namespace WiiCompiled.Setup.Linux;
+
+/// <summary>Stable stage identifiers reported by <c>--progress-json</c>.</summary>
+internal static class InstallStages
+{
+    public const string Validate = "validate";
+    public const string ExtractDisc = "extract-disc";
+    public const string Build = "build";
+    public const string Shortcuts = "shortcuts";
+}

Launcher/WiiCompiled.Setup.Linux/Models.cs

@@ -1,9 +1,13 @@
+using System.Reflection;
+
 namespace WiiCompiled.Setup.Linux;
 
 internal static class ProductInfo
 {
     public const string Name = "WiiCompiled";
-    public const string Version = "0.2.32";
+    public static readonly string Version =
+        typeof(ProductInfo).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!
+            .InformationalVersion;
 }
 
 /// <summary>One installed product's record inside install-state.json.</summary>

Launcher/WiiCompiled.Setup.Linux/Program.cs

@@ -31,7 +31,7 @@ internal static class Program
         var (command, flags) = ParseArgs(args);
         if (command is null) { PrintUsage(); return 1; }
         var progressJson = flags.ContainsKey("progress-json");
-        IInstallReporter reporter = progressJson ? new NdjsonInstallReporter() : new ConsoleInstallReporter();
+        IInstallReporter reporter = progressJson ? new NdjsonInstallReporter(ProductInfo.Version) : new ConsoleInstallReporter();
 
         try
         {
@@ -127,19 +127,40 @@ internal static class Program
         string? retroWfcOfflineDir = null;
         if (downloadPayload)
         {
-            // Reused if a previous install already downloaded and it's still valid - matches
-            // Windows's own reuse-if-valid behavior instead of re-downloading on every install.
             var cacheDir = Path.Combine(workspace, "generated", "retro-wfc-payload");
-            reporter.Progress(InstallStages.Validate, "Preparing the Retro-WFC payload", 1);
+            reporter.Progress(InstallStages.Validate,
+                "Downloading the current Retro-WFC payload", 1);
             try
             {
-                RetroWfcPayload.ValidateStagedRetroWfcPayloadDirectory(cacheDir);
-            }
-            catch (InvalidDataException)
-            {
+                // A valid signature authenticates a payload, but does not prove it is the latest
+                // signed revision. Always ask the fixed endpoint for the current snapshot; the
+                // downloader verifies it before atomically replacing the cache.
                 await RetroWfcPayload.DownloadRetroWfcPayloadAsync(
                     RetroWfcPayload.CurrentRetroWfcPayloadUri, cacheDir, token);
             }
+            catch (Exception downloadFailure) when (!token.IsCancellationRequested &&
+                                                     downloadFailure is HttpRequestException or TimeoutException
+                                                         or IOException)
+            {
+                // Offline installs may continue with a previously authenticated snapshot. Do not
+                // use this path for a newly downloaded payload that failed signature validation:
+                // that must remain a hard failure instead of hiding possible endpoint tampering.
+                try
+                {
+                    RetroWfcPayload.ValidateStagedRetroWfcPayloadDirectory(cacheDir);
+                }
+                catch (Exception cacheFailure) when (cacheFailure is IOException or
+                                                     UnauthorizedAccessException or InvalidDataException)
+                {
+                    throw new InvalidOperationException(
+                        "The current Retro-WFC payload could not be downloaded and no valid cached " +
+                        $"payload is available ({cacheFailure.Message.TrimEnd('.')}).", downloadFailure);
+                }
+
+                reporter.Diagnostic(
+                    "The current Retro-WFC payload could not be downloaded; using the previously " +
+                    $"verified cached payload instead ({downloadFailure.Message.TrimEnd('.')}).");
+            }
             retroWfcOfflineDir = cacheDir;
         }
 

Launcher/WiiCompiled.Setup.Linux/WiiCompiled.Setup.Linux.csproj

@@ -6,7 +6,6 @@
     <Nullable>enable</Nullable>
     <AssemblyName>WiiCompiled.Setup.Linux</AssemblyName>
     <RootNamespace>WiiCompiled.Setup.Linux</RootNamespace>
-    <Version>0.2.32</Version>
     <Authors>patchzy</Authors>
     <Product>WiiCompiled</Product>
     <Description>Command-line installer and launcher for WiiCompiled on Linux</Description>
@@ -16,5 +15,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\WiiCompiled.Setup.Common\WiiCompiled.Setup.Common.csproj" />
+    <Using Include="WiiCompiled.Setup.Common" />
   </ItemGroup>
 </Project>

Launcher/WiiCompiled.Setup.Windows/ConsoleCommands.cs

@@ -57,7 +57,7 @@ internal static class ConsoleCommands
 
     public static int VerifyInputs(CommandLine command)
     {
-        var reporter = command.ProgressJson ? new NdjsonInstallReporter() : null;
+        var reporter = command.ProgressJson ? new NdjsonInstallReporter(ProductInfo.Version) : null;
         var temp = Path.Combine(Path.GetTempPath(), "mkwc-verify-" + Guid.NewGuid().ToString("N"));
         Directory.CreateDirectory(temp);
         try
@@ -107,7 +107,7 @@ internal static class ConsoleCommands
         }
         File.WriteAllText(logPath, $"{ProductInfo.Name} setup {ProductInfo.Version}{Environment.NewLine}");
 
-        var ndjson = command.ProgressJson ? new NdjsonInstallReporter(Log) : null;
+        var ndjson = command.ProgressJson ? new NdjsonInstallReporter(ProductInfo.Version, Log) : null;
         IInstallReporter reporter = ndjson ?? (IInstallReporter)new ConsoleInstallReporter(Log);
         var installDirectory = Path.GetFullPath(command.InstallDirectory!);
         try
@@ -145,7 +145,7 @@ internal static class ConsoleCommands
     public static int CheckProducts(CommandLine command,
         CancellationToken cancellationToken = default)
     {
-        var reporter = command.ProgressJson ? new NdjsonInstallReporter() : null;
+        var reporter = command.ProgressJson ? new NdjsonInstallReporter(ProductInfo.Version) : null;
         var installation = new Installation(string.IsNullOrWhiteSpace(command.InstallDirectory)
             ? AppContext.BaseDirectory
             : Path.GetFullPath(command.InstallDirectory));
@@ -198,7 +198,7 @@ internal static class ConsoleCommands
             }
         }
 
-        var ndjson = command.ProgressJson ? new NdjsonInstallReporter(Log) : null;
+        var ndjson = command.ProgressJson ? new NdjsonInstallReporter(ProductInfo.Version, Log) : null;
         IInstallReporter reporter = ndjson is null ? new ConsoleInstallReporter(Log) : ndjson;
         var installDirectory = Path.GetFullPath(command.InstallDirectory!);
         var installation = new Installation(installDirectory);

Launcher/WiiCompiled.Setup.Windows/InstallStages.cs

@@ -0,0 +1,17 @@
+namespace WiiCompiled.Setup.Windows;
+
+/// <summary>
+/// Stable stage identifiers reported by <c>--progress-json</c>. These are part of the public
+/// WheelWizard contract (docs/WHEELWIZARD_CONTRACT.md): the strings may gain new members, but an
+/// existing identifier never changes meaning.
+/// </summary>
+internal static class InstallStages
+{
+    public const string Validate = "validate";
+    public const string ExtractToolkit = "extract-toolkit";
+    public const string ExtractDisc = "extract-disc";
+    public const string PrepareRetro = "prepare-retro";
+    public const string BuildBase = "build-base";
+    public const string BuildRetro = "build-retro";
+    public const string Publish = "publish";
+}

Launcher/WiiCompiled.Setup.Windows/InstallerEngine.cs

@@ -501,17 +501,31 @@ internal sealed class InstallerEngine
         var dol = Path.Combine(dataRoot, "sys", "main.dol");
         var rel = Path.Combine(dataRoot, "files", "rel", "StaticR.rel");
         var fst = Path.Combine(dataRoot, "sys", "fst.bin");
-        if (!File.Exists(dol) || !File.Exists(rel) || !File.Exists(fst))
-            throw new InvalidDataException("The disc extraction is missing required Mario Kart Wii files.");
-        var dolHash = InputValidation.Sha256File(dol);
-        var relHash = InputValidation.Sha256File(rel);
-        if (!dolHash.Equals(manifest.ExpectedDolSha256, StringComparison.OrdinalIgnoreCase) ||
-            !relHash.Equals(manifest.ExpectedRelSha256, StringComparison.OrdinalIgnoreCase))
-        {
+        var missing = new[] { dol, rel, fst }.Where(path => !File.Exists(path))
+            .Select(path => Path.GetRelativePath(dataRoot, path)).ToList();
+        if (missing.Count > 0)
             throw new InvalidDataException(
-                "The disc is RMCP01 but does not match the supported clean PAL revision. " +
-                "Patched or otherwise modified game code cannot be installed safely.");
+                "The disc extraction is missing required Mario Kart Wii files: " +
+                string.Join(", ", missing) + ".");
+
+        var mismatches = new List<string>();
+        foreach (var (name, path, expected) in new[]
+                 {
+                     ("main.dol", dol, manifest.ExpectedDolSha256),
+                     ("StaticR.rel", rel, manifest.ExpectedRelSha256)
+                 })
+        {
+            var actual = InputValidation.Sha256File(path);
+            if (!actual.Equals(expected, StringComparison.OrdinalIgnoreCase))
+                mismatches.Add($"{name} is {new FileInfo(path).Length:N0} bytes with SHA-256 {actual} " +
+                               $"(expected {expected})");
         }
+
+        if (mismatches.Count > 0)
+            throw new InvalidDataException(
+                "The disc is RMCP01 but its game code does not match the supported clean PAL revision: " +
+                string.Join("; ", mismatches) + ". " +
+                "Patched or otherwise modified game code cannot be installed safely.");
     }
 
     private static void ValidateInstallDirectory(string path) =>

Launcher/WiiCompiled.Setup.Windows/ProductRepairService.cs

@@ -110,8 +110,7 @@ internal sealed class ProductRepairService
                     InputValidation.CurrentRetroWfcPayloadUri, payloadScratch, cancellationToken);
             }
             catch (Exception ex) when (!cancellationToken.IsCancellationRequested &&
-                                       ex is HttpRequestException or IOException or InvalidDataException
-                                           or InvalidOperationException or OperationCanceledException)
+                                       ex is HttpRequestException or TimeoutException or IOException)
             {
                 payloadSnapshot = RecoverInstalledRetroWfcPayload(toolkitFingerprint,
                     Path.Combine(scratchRoot, "retro-wfc-payload-recovered"), ex, cancellationToken);

Launcher/WiiCompiled.Setup.Windows/Program.cs

@@ -1,5 +1,6 @@
 namespace WiiCompiled.Setup.Windows;
 
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 internal static class Program
@@ -30,7 +31,7 @@ internal static class Program
             {
                 // A command line was supplied, so a caller is driving this process. Rejecting the
                 // command with a modal dialog would hang that caller forever.
-                if (progressJson) new NdjsonInstallReporter().Failure(ex.Message);
+                if (progressJson) new NdjsonInstallReporter(ProductInfo.Version).Failure(ex.Message);
                 else Console.Error.WriteLine(ex.Message);
                 return 1;
             }
@@ -90,7 +91,7 @@ internal static class Program
             // errors raised outside it.
             if (progressJson)
             {
-                new NdjsonInstallReporter().Failure(ex.Message);
+                new NdjsonInstallReporter(ProductInfo.Version).Failure(ex.Message);
                 Console.Error.WriteLine(ex);
             }
             else
@@ -121,7 +122,9 @@ internal static class PlatformChecks
 internal static class ProductInfo
 {
     public const string Name = "WiiCompiled";
-    public const string Version = "0.2.32";
+    public static readonly string Version =
+        typeof(ProductInfo).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!
+            .InformationalVersion;
 
     /// <summary>
     /// The setup executable is copied into the installation under this name. It is the launcher and

Launcher/WiiCompiled.Setup.Windows/SelfTests.cs

@@ -1,5 +1,6 @@
 using System.Buffers.Binary;
 using System.Security.Cryptography;
+using Tomlyn;
 using WiiCompiled.Setup.Common;
 
 namespace WiiCompiled.Setup.Windows;
@@ -51,6 +52,7 @@ internal static class SelfTests
             RuntimeConfiguration.SetRetroRewindRoot, RuntimeConfiguration.RemoveRetroRewindRootIfOwned),
             failures);
         Test("Runtime configuration key matching", TestRuntimeConfigurationKeyMatching, failures);
+        Test("Runtime configuration quoted keys", TestRuntimeConfigurationQuotedKeys, failures);
         Test("Install location validation", TestInstallLocationValidation, failures);
         Test("Command line contract", TestCommandLineContract, failures);
         Test("Portable root discovery", TestPortableRootDiscovery, failures);
@@ -229,6 +231,70 @@ internal static class SelfTests
         }
     }
 
+    /// <summary>
+    /// Quoted and bare spellings of a key or table are the same TOML key, so rewriting replaces the
+    /// entry in place, keeps everything else byte-identical, and never touches an unparseable file.
+    /// </summary>
+    private static void TestRuntimeConfigurationQuotedKeys()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "mkwc-tomlquoted-" + Guid.NewGuid().ToString("N"));
+        var config = Path.Combine(root, RuntimeConfiguration.ConfigFileName);
+        var owned = Path.Combine(root, "Owned Location");
+        var fullOwned = Path.GetFullPath(owned);
+        try
+        {
+            Directory.CreateDirectory(owned);
+            foreach (var header in new[] { "[\"paths\"]", "[ 'paths' ]", "[paths]" })
+            foreach (var key in new[] { "\"dvd_root\"", "'dvd_root'", "\"dvd\\u005Froot\"", "dvd_root" })
+            {
+                File.WriteAllText(config,
+                    $"# top\r\n[video]\r\nwidescreen = true # keep\r\n\r\n{header}\r\n  {key}=\"D:\\\\Old\" # note\r\nother = 1\r\n");
+                RuntimeConfiguration.SetDvdRoot(config, owned);
+                var text = File.ReadAllText(config);
+                var expected = $"# top\r\n[video]\r\nwidescreen = true # keep\r\n\r\n{header}\r\n  {key}=" +
+                               $"\"{fullOwned.Replace("\\", "\\\\")}\" # note\r\nother = 1\r\n";
+                if (text != expected)
+                    throw new Exception($"{header} {key} was not replaced in place:\r\n{text}");
+                if (RuntimeConfiguration.GetResolvedPath(config, "dvd_root") != fullOwned)
+                    throw new Exception($"The replaced {key} could not be read back.");
+            }
+
+            File.WriteAllText(config, "[paths]\r\nother = 1\r\n\r\n# next\r\n[video]\r\nx = 2");
+            RuntimeConfiguration.SetDvdRoot(config, owned);
+            var appended = File.ReadAllText(config);
+            if (!appended.StartsWith("[paths]\r\nother = 1\r\ndvd_root = ", StringComparison.Ordinal) ||
+                !appended.EndsWith("\r\n\r\n# next\r\n[video]\r\nx = 2", StringComparison.Ordinal))
+                throw new Exception("A missing key was not appended to its section:\r\n" + appended);
+
+            File.WriteAllText(config, "dvd_root = \"D:\\\\Root\"\r\n[video]\r\nx = 2\r\n");
+            RuntimeConfiguration.SetDvdRoot(config, owned);
+            var created = File.ReadAllText(config);
+            if (!created.StartsWith("dvd_root = \"D:\\\\Root\"\r\n[video]\r\nx = 2\r\n\r\n[paths]\r\n", StringComparison.Ordinal) ||
+                RuntimeConfiguration.GetResolvedPath(config, "dvd_root") != fullOwned)
+                throw new Exception("A missing section was not created without touching a same-named root key:\r\n" + created);
+
+            File.Delete(config);
+            RuntimeConfiguration.SetDvdRoot(config, owned);
+            if (RuntimeConfiguration.GetResolvedPath(config, "dvd_root") != fullOwned)
+                throw new Exception("A missing config file was not created.");
+
+            const string broken = "[paths]\r\ndvd_root = 1\r\ndvd_root = 2\r\n";
+            File.WriteAllText(config, broken);
+            try
+            {
+                RuntimeConfiguration.SetDvdRoot(config, owned);
+                throw new Exception("An unparseable config was rewritten.");
+            }
+            catch (TomlException) { }
+            if (File.ReadAllText(config) != broken)
+                throw new Exception("An unparseable config was modified.");
+        }
+        finally
+        {
+            if (Directory.Exists(root)) Directory.Delete(root, recursive: true);
+        }
+    }
+
     /// <summary>
     /// One location rule set covers both an installation directory and a portable root, so the
     /// rejections a portable install performs are the ones an ordinary install performs too.
@@ -1073,10 +1139,10 @@ internal static class SelfTests
             if (topologyChangedRuntimeAssets == changedRuntimeAssets)
                 throw new Exception("An empty copied runtime-asset directory was omitted from its identity.");
 
-            // Cache-reuse subsets: translator or runtime/src changes (the translator regex-scans it
-            // for native overrides and effect contracts) invalidate translation but not toolchain,
-            // since CMake/Ninja rebuild exactly the affected objects; a compiler change invalidates
-            // only toolchain; a native_prebuilt provenance rewrite invalidates neither.
+            // Cache-reuse subsets: translator or native registration changes invalidate translation
+            // but not toolchain, since CMake/Ninja rebuild exactly the affected objects; a compiler
+            // change invalidates only toolchain; a native_prebuilt provenance rewrite invalidates
+            // neither. Without a current native index, runtime/src itself decides translation.
             var components = ToolkitFingerprint.ComputeComponents(root);
             if (components.Compile != afterPatch)
                 throw new Exception("ComputeComponents disagrees with the compile identity.");
@@ -1087,15 +1153,36 @@ internal static class SelfTests
                 throw new Exception("A new translator did not change the translation identity.");
             if (afterNewTranslator.NativeToolchain != components.NativeToolchain)
                 throw new Exception("A new translator needlessly changed the native toolchain identity.");
-            File.WriteAllText(Path.Combine(root, "BuildWorkspace", "runtime", "src", "main.cpp"),
-                "int main3();");
+            var runtimeMain = Path.Combine(root, "BuildWorkspace", "runtime", "src", "main.cpp");
+            File.WriteAllText(runtimeMain, "int main3();");
+            var afterUnindexedRuntime = ToolkitFingerprint.ComputeComponents(root);
+            if (afterUnindexedRuntime.Translation == afterNewTranslator.Translation)
+                throw new Exception("A runtime source change without a native index did not change the translation identity.");
+
+            File.WriteAllText(runtimeMain, "int main();");
+            if (WriteFakeNativeIndex(root, "\"a\"") !=
+                "50b9779591f4b205751361c8899accd362f96ea5dfd32febed1bedca534c523a")
+                throw new Exception("The native index source digest no longer matches the translator's.");
+            var indexed = ToolkitFingerprint.ComputeComponents(root);
+            File.WriteAllText(runtimeMain, "int main3();");
+            WriteFakeNativeIndex(root, "\"a\"");
             var afterNewRuntime = ToolkitFingerprint.ComputeComponents(root);
-            if (afterNewRuntime.Translation == afterNewTranslator.Translation)
-                throw new Exception("A runtime source change did not change the translation identity.");
-            if (afterNewRuntime.NativeToolchain != afterNewTranslator.NativeToolchain)
+            if (afterNewRuntime.Translation != indexed.Translation)
+                throw new Exception("A runtime source change with unchanged registrations changed the translation identity.");
+            if (afterNewRuntime.NativeToolchain != indexed.NativeToolchain)
                 throw new Exception("A runtime source change needlessly changed the native toolchain identity.");
-            if (afterNewRuntime.Compile == afterNewTranslator.Compile)
+            if (afterNewRuntime.Compile == indexed.Compile)
                 throw new Exception("A runtime source change did not change the compile identity.");
+            File.WriteAllText(runtimeMain, "int main4();");
+            if (ToolkitFingerprint.ComputeComponents(root).Translation == afterNewRuntime.Translation)
+                throw new Exception("A stale native index was trusted for the translation identity.");
+            File.WriteAllText(runtimeMain, "int main3();");
+            WriteFakeNativeIndex(root, "\"a\", \"b\"");
+            afterNewRuntime = ToolkitFingerprint.ComputeComponents(root);
+            if (afterNewRuntime.Translation == indexed.Translation)
+                throw new Exception("A native registration change did not change the translation identity.");
+            if (afterNewRuntime.NativeToolchain != indexed.NativeToolchain)
+                throw new Exception("A native registration change needlessly changed the native toolchain identity.");
             File.WriteAllText(Path.Combine(root, "Toolkit", "llvm-mingw", "bin", "clang-22.exe"),
                 "clang-v2");
             var afterNewCompiler = ToolkitFingerprint.ComputeComponents(root);
@@ -1148,6 +1235,26 @@ internal static class SelfTests
         }
     }
 
+    /// <summary>Writes a native index current for the fake runtime/src; returns its source digest.</summary>
+    private static string WriteFakeNativeIndex(string root, string registrations)
+    {
+        var source = Path.Combine(root, "BuildWorkspace", "runtime", "src");
+        var manifest = new System.Text.StringBuilder();
+        foreach (var (relative, path) in Directory.EnumerateFiles(source, "*", SearchOption.AllDirectories)
+                     .Where(path => path.EndsWith(".cpp", StringComparison.OrdinalIgnoreCase) ||
+                                    path.EndsWith(".h", StringComparison.OrdinalIgnoreCase) ||
+                                    path.EndsWith(".hpp", StringComparison.OrdinalIgnoreCase))
+                     .Select(path => (Path.GetRelativePath(source, path).Replace('\\', '/'), path))
+                     .OrderBy(item => item.Item1, StringComparer.Ordinal))
+            manifest.Append(InputValidation.Sha256File(path)).Append("  ").Append(relative).Append('\n');
+        var digest = Convert.ToHexString(SHA256.HashData(System.Text.Encoding.UTF8.GetBytes(manifest.ToString())))
+            .ToLowerInvariant();
+        File.WriteAllText(Path.Combine(root, "BuildWorkspace", "runtime", "native-index.json"),
+            "{\n  \"format\": \"wiicompiled-runtime-native-index\",\n  \"sourceDigest\": \"" + digest +
+            "\",\n  \"registrations\": [" + registrations + "]\n}\n");
+        return digest;
+    }
+
     private static void CreateFakeToolkit(string root)
     {
         Directory.CreateDirectory(Path.Combine(root, "Toolkit", "Translator"));

Launcher/WiiCompiled.Setup.Windows/ToolkitFingerprint.cs

@@ -1,5 +1,7 @@
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using WiiCompiled.Setup.Common;
 
 namespace WiiCompiled.Setup.Windows;
@@ -12,9 +14,10 @@ namespace WiiCompiled.Setup.Windows;
 internal static class ToolkitFingerprint
 {
     // v6/native-toolchain v2 forces one clean rebuild past a Ninja stale-object bug.
-    // translation v2 added runtime/src, which the translator regex-scans for native overrides.
+    // translation v2 added runtime/src, which the translator regex-scans for native overrides;
+    // v3 replaced it with the native index extracted from it, whenever that index is current.
     private const string Version = "mkwc-toolkit-compile-v6";
-    private const string TranslationVersion = "mkwc-toolkit-translation-v2";
+    private const string TranslationVersion = "mkwc-toolkit-translation-v3";
     private const string NativeToolchainVersion = "mkwc-toolkit-native-toolchain-v2";
     private const string PackageVersion = "mkwc-toolkit-package-v1";
     private const string RuntimeAssetsVersion = "mkwc-product-runtime-assets-v3";
@@ -25,20 +28,25 @@ internal static class ToolkitFingerprint
          ".cmake", ".txt", ".yml", ".yaml", ".toml", ".json", ".ps1", ".in", ".def", ".patch"];
 
     /// <summary>
-    /// Inputs that decide translator output: translator, translation project, runtime sources it
-    /// scans for native override registrations/effect contracts, and the build script's translator
-    /// command lines. Unchanged means the completed base translation can be reused instead of re-run.
+    /// Inputs that decide translator output: translator, translation project, the native override
+    /// registrations/effect contracts it extracts from runtime/src (see
+    /// <see cref="AddNativeRegistrations"/>), and the build script's translator command lines.
+    /// Unchanged means the completed base translation can be reused instead of re-run.
     /// </summary>
     private static readonly string[] TranslationPrefixes =
     [
         InstalledLayout.ToolkitEntryPrefix + "Translator/",
-        InstalledLayout.WorkspaceEntryPrefix + "projects/",
-        InstalledLayout.WorkspaceEntryPrefix + "runtime/src/"
+        InstalledLayout.WorkspaceEntryPrefix + "projects/"
     ];
 
     private static readonly string[] TranslationFiles =
         [InstalledLayout.WorkspaceEntryPrefix + "LocalBuild.ps1"];
 
+    private const string NativeSourcePrefix = InstalledLayout.WorkspaceEntryPrefix + "runtime/src/";
+    private const string NativeIndexEntry = InstalledLayout.WorkspaceEntryPrefix + "runtime/native-index.json";
+    // The file set the translator's native index source digest covers.
+    private static readonly string[] NativeIndexSourceExtensions = [".cpp", ".h", ".hpp"];
+
     /// <summary>
     /// Inputs that make compiled objects unsafe to reuse: the compiler/CMake/Ninja toolchain, the
     /// shipped runtime DLLs, and the scripts owning configure flags. Source/dependency changes are
@@ -108,14 +116,16 @@ internal static class ToolkitFingerprint
         if (entries.Count == 0)
             throw new InvalidDataException($"No toolkit files were found under {root}; the installation is incomplete.");
 
+        var translation = SelectSubset(entries, TranslationPrefixes, TranslationFiles);
+        AddNativeRegistrations(translation, entries, root);
         return new ToolkitFingerprintComponents(
             BuildIdentity(Version, entries),
-            BuildSubsetIdentity(TranslationVersion, entries, TranslationPrefixes, TranslationFiles),
-            BuildSubsetIdentity(NativeToolchainVersion, entries, NativeToolchainPrefixes,
-                NativeToolchainFiles));
+            BuildIdentity(TranslationVersion, translation),
+            BuildIdentity(NativeToolchainVersion,
+                SelectSubset(entries, NativeToolchainPrefixes, NativeToolchainFiles)));
     }
 
-    private static string BuildSubsetIdentity(string version, SortedDictionary<string, string> entries,
+    private static SortedDictionary<string, string> SelectSubset(SortedDictionary<string, string> entries,
         string[] prefixes, string[] files)
     {
         var subset = new SortedDictionary<string, string>(StringComparer.Ordinal);
@@ -125,9 +135,61 @@ internal static class ToolkitFingerprint
                 files.Any(file => relative.Equals(file, StringComparison.Ordinal)))
                 subset[relative] = hash;
         }
-        return BuildIdentity(version, subset);
+        return subset;
     }
 
+    /// <summary>
+    /// A native-index.json extracted from exactly the shipped runtime/src stands in for those
+    /// sources, minus its source digest, so a runtime change that leaves the registrations alone
+    /// keeps the base translation. A missing, unreadable or stale index keeps the sources instead.
+    /// </summary>
+    private static void AddNativeRegistrations(SortedDictionary<string, string> subset,
+        SortedDictionary<string, string> entries, string root)
+    {
+        var sources = entries.Where(entry => entry.Key.StartsWith(NativeSourcePrefix, StringComparison.Ordinal))
+            .ToList();
+        var registrations = TryHashCurrentNativeIndex(
+            Path.Combine(InstalledLayout.Workspace(root), "runtime", "native-index.json"), sources);
+        if (registrations is not null)
+        {
+            subset[NativeIndexEntry] = registrations;
+            return;
+        }
+        foreach (var (relative, hash) in sources) subset[relative] = hash;
+    }
+
+    private static string? TryHashCurrentNativeIndex(string path, List<KeyValuePair<string, string>> sources)
+    {
+        if (!File.Exists(path)) return null;
+        JsonObject? document;
+        try { document = JsonNode.Parse(File.ReadAllText(path)) as JsonObject; }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or JsonException)
+        {
+            return null;
+        }
+        if (document?["sourceDigest"] is not JsonValue recorded || !recorded.TryGetValue<string>(out var digest))
+            return null;
+
+        // Mirrors the translator's RuntimeNativeIndexFile.ComputeSourceDigest.
+        var manifest = new StringBuilder();
+        foreach (var (relative, hash) in sources)
+        {
+            if (!NativeIndexSourceExtensions.Any(extension =>
+                    relative.EndsWith(extension, StringComparison.OrdinalIgnoreCase)))
+                continue;
+            manifest.Append(hash).Append("  ").Append(relative, NativeSourcePrefix.Length,
+                relative.Length - NativeSourcePrefix.Length).Append('\n');
+        }
+        if (!digest.Equals(Sha256Hex(manifest.ToString()), StringComparison.OrdinalIgnoreCase))
+            return null;
+
+        document.Remove("sourceDigest");
+        return Sha256Hex(document.ToJsonString());
+    }
+
+    private static string Sha256Hex(string text) =>
+        Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(text))).ToLowerInvariant();
+
     /// <summary>
     /// Content identity of the source-owned files copied verbatim beside every product. This is
     /// intentionally independent of <see cref="Compute"/>: an asset-only release is published
@@ -273,8 +335,7 @@ internal static class ToolkitFingerprint
         var builder = new StringBuilder(version).Append('\n');
         foreach (var (relative, hash) in entries)
             builder.Append(relative).Append('|').Append(hash).Append('\n');
-        return Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(builder.ToString())))
-            .ToLowerInvariant();
+        return Sha256Hex(builder.ToString());
     }
 }
 

Launcher/WiiCompiled.Setup.Windows/WiiCompiled.Setup.Windows.csproj

@@ -7,7 +7,6 @@
     <AssemblyName>WiiCompiled.Setup</AssemblyName>
     <RootNamespace>WiiCompiled.Setup.Windows</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>0.2.32</Version>
     <Authors>patchzy</Authors>
     <Product>WiiCompiled</Product>
     <Description>Command-line installer and launcher for WiiCompiled</Description>
@@ -16,5 +15,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\WiiCompiled.Setup.Common\WiiCompiled.Setup.Common.csproj" />
+    <Using Include="WiiCompiled.Setup.Common" />
   </ItemGroup>
 </Project>

Launcher/build-appimage.sh

@@ -127,10 +127,10 @@ mkdir -p "$appdir/usr/toolchain"
 cp -a "$workspace/Launcher/artifacts/portable-tools/toolchain-$appimagetool_arch"/. "$appdir/usr/toolchain/"
 
 # Precompiled aurora + third-party package (see Prepare-NativePrebuilt.sh) so a user's own
-# local-build.sh never has to compile aurora itself (~43% of local build CPU time). Re-harvesting
-# recompiles the whole aurora/Crypto++ closure with the toolchain above, so this is skipped unless
-# --print-fingerprint-only (a fast, build-free check) says the existing package no longer matches
-# the current compiler/flags/aurora/third_party sources.
+# local-build.sh never has to compile aurora itself (~43% of local build CPU time), nor on x86_64
+# the game-independent runtime. Re-harvesting recompiles that closure with the toolchain above, so
+# this is skipped unless --print-fingerprint-only (a fast, build-free check) says the existing
+# package no longer matches the current compiler, flags, source trees or mbed TLS pin.
 native_prebuilt_dir="$workspace/Launcher/artifacts/native-prebuilt-$appimagetool_arch"
 echo "Checking whether the precompiled aurora + third-party package ($appimagetool_arch) is current..."
 current_fingerprint=$(bash "$script_dir/Prepare-NativePrebuilt.sh" --arch "$appimagetool_arch" --print-fingerprint-only)
@@ -148,6 +148,9 @@ fields = {
     "flag_fingerprint": "FlagFingerprint",
     "aurora_fingerprint": "AuroraSourceFingerprint",
     "third_party_fingerprint": "ThirdPartySourceFingerprint",
+    "mbedtls_fingerprint": "MbedTlsFingerprint",
+    # Only printed on x86_64, so a package without the runtime archive is stale there.
+    "runtime_fingerprint": "RuntimeSourceFingerprint",
 }
 print(1 if all(provenance.get(v) == current.get(k) for k, v in fields.items()) else 0)
 PY
@@ -166,6 +169,8 @@ echo "Staging the bundled workspace snapshot..."
 for dir in runtime aurora-main projects; do
     cp -r "$workspace/$dir" "$appdir/workspace/$dir"
 done
+# Ship source bytes, never submodule checkout pointers or embedded Git databases.
+find "$appdir/workspace" -name .git -prune -exec rm -rf {} +
 # Mirrors Build-Installer.ps1's own staging exclusions exactly: aurora-main/extern/CMakeLists.txt
 # is the real FetchContent driver and must ship, but any already-fetched dependency *subdirectory*
 # a developer's local checkout accumulated under extern/ is stale/large build output, not a
@@ -173,7 +178,29 @@ done
 # is a plain developer build directory.
 find "$appdir/workspace/aurora-main/extern" -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} +
 rm -rf "$appdir/workspace/runtime/build"
-cp "$workspace/Launcher/local-build.sh" "$appdir/workspace/Launcher/local-build.sh"
+cp "$workspace/Launcher/local-build.sh" "$workspace/Launcher/build-cache.sh" "$appdir/workspace/Launcher/"
+
+# The translation identity (build-cache.sh) covers the runtime's native registrations through this
+# index, so it is extracted from exactly the bundled runtime sources.
+echo "Extracting the runtime native index..."
+"$appdir/usr/bin/translator-cli" emit-native-index \
+    --native-source-dir "$appdir/workspace/runtime/src" \
+    --out "$appdir/workspace/runtime/native-index.json"
+[[ -f "$appdir/workspace/runtime/native-index.json" ]] || { echo "build-appimage.sh: the native index was not written" >&2; exit 1; }
+
+# A bundled runtime that fingerprints differently from the shipped archive would make every
+# installation silently compile the runtime from source.
+if [[ "$appimagetool_arch" == x86_64 ]]; then
+    staged_runtime_fingerprint=$("$workspace/Launcher/artifacts/portable-tools/toolchain-$appimagetool_arch/bin/cmake" \
+        -DMKW_RUNTIME_DIR="$appdir/workspace/runtime" -P "$appdir/workspace/runtime/cmake/RuntimeFingerprint.cmake" |
+        sed -n 's/^runtime_fingerprint=//p')
+    packaged_runtime_fingerprint=$(python3 -c 'import json, sys; print(json.load(open(sys.argv[1], encoding="utf-8")).get("RuntimeSourceFingerprint", ""))' \
+        "$appdir/native-prebuilt/provenance.json")
+    if [[ -z "$staged_runtime_fingerprint" || "$staged_runtime_fingerprint" != "$packaged_runtime_fingerprint" ]]; then
+        echo "build-appimage.sh: the bundled runtime ($staged_runtime_fingerprint) does not match the precompiled runtime archive ($packaged_runtime_fingerprint)" >&2
+        exit 1
+    fi
+fi
 
 # AppRun re-syncs runtime/aurora-main/projects/local-build.sh into the writable cache only when
 # this changes, so it must change whenever any of those bundled paths actually did - a bare commit
@@ -203,12 +230,9 @@ CACHE="${XDG_DATA_HOME:-$HOME/.local/share}/WiiCompiled/workspace"
 mkdir -p "$CACHE"
 if [ ! -f "$CACHE/.bundle-version" ] || \
    [ "$(cat "$HERE/workspace/.bundle-version")" != "$(cat "$CACHE/.bundle-version")" ]; then
-    mkdir -p "$CACHE/Launcher"
-    for dir in runtime aurora-main projects; do
-        rm -rf "$CACHE/$dir"
-        cp -r "$HERE/workspace/$dir" "$CACHE/$dir"
-    done
-    cp "$HERE/workspace/Launcher/local-build.sh" "$CACHE/Launcher/local-build.sh"
+    # Unchanged files keep their timestamps so the incremental build survives the update.
+    source "$HERE/workspace/Launcher/build-cache.sh"
+    mkw_sync_tree "$HERE/workspace" "$CACHE" runtime aurora-main projects Launcher >&2
     cp "$HERE/workspace/.bundle-version" "$CACHE/.bundle-version"
 fi
 # toolchain/ and native-prebuilt/ are NOT copied into the cache (they're large - ~500 MiB /

Launcher/build-cache.sh

@@ -0,0 +1,148 @@
+# Shared incremental-build logic for the Unix setups (Linux AppImage and macOS), sourced by
+# local-build.sh, local-build-macos.command, the AppImage's AppRun and macos/setup.command.
+# Mirrors the Windows installer's translation/toolchain identities and timestamp preservation.
+# Must stay compatible with macOS's bash 3.2.
+
+if command -v sha256sum >/dev/null 2>&1; then
+    mkw_sha256_cmd=(sha256sum)
+else
+    mkw_sha256_cmd=(shasum -a 256)
+fi
+
+mkw_sha256() {
+    "${mkw_sha256_cmd[@]}" "$@" | awk '{print $1}'
+}
+
+# Prints "<sha>  <relative path>" for every file under each directory, relative to $1.
+mkw_digest_tree() {
+    local root=$1; shift
+    (
+        cd "$root" || exit 1
+        local dir
+        for dir in "$@"; do
+            if [[ -d "$dir" ]]; then
+                printf 'tree %s\n' "$dir"
+                find "$dir" -type f -print0 | LC_ALL=C sort -z | xargs -0 "${mkw_sha256_cmd[@]}" /dev/null
+            else
+                printf 'absent %s\n' "$dir"
+            fi
+        done
+    )
+}
+
+# Content-only digest of a file or directory, independent of where it lives (the AppImage mount
+# path changes every launch).
+mkw_digest_path() {
+    if [[ -d "$1" ]]; then
+        mkw_digest_tree "$1" . | mkw_sha256
+    elif [[ -f "$1" ]]; then
+        mkw_sha256 < "$1"
+    else
+        printf 'absent\n'
+    fi
+}
+
+# Same digest as the translator's RuntimeNativeIndexFile.ComputeSourceDigest. $1 = runtime/src.
+mkw_native_source_digest() {
+    (
+        cd "$1" || exit 1
+        find . -type f \( -iname '*.cpp' -o -iname '*.h' -o -iname '*.hpp' \) -print0 | LC_ALL=C sort -z |
+            xargs -0 "${mkw_sha256_cmd[@]}" /dev/null
+    ) | grep -v '  /dev/null$' | sed 's|  \./|  |' | mkw_sha256
+}
+
+# The native registrations the translator reads from runtime/src. A current native-index.json
+# stands in for the sources (minus its source digest), so runtime edits that leave the
+# registrations alone keep the translation; a missing or stale index falls back to the sources.
+# $1 = workspace.
+mkw_native_index_identity() {
+    local index="$1/runtime/native-index.json" recorded
+    recorded=$(mkw_read_identity "$index" sourceDigest)
+    if [[ -n "$recorded" && -d "$1/runtime/src" && "$recorded" == "$(mkw_native_source_digest "$1/runtime/src")" ]]; then
+        printf 'native-index %s\n' "$(grep -v '^[[:space:]]*"sourceDigest"[[:space:]]*:' "$index" | mkw_sha256)"
+    else
+        mkw_digest_tree "$1" runtime/src
+    fi
+}
+
+# Everything the base translation depends on: game inputs, project, native registrations, the
+# translator itself and the build script that drives it.
+# $1 = workspace, $2 = translator file or directory, $3 = build script.
+mkw_translation_identity() {
+    local workspace=$1 translator=$2 script=$3
+    {
+        printf 'mkw-translation-v2\n'
+        printf 'dol %s\n' "$(mkw_digest_path "$workspace/Assets/main.dol")"
+        printf 'rel %s\n' "$(mkw_digest_path "$workspace/Assets/StaticR.rel")"
+        printf 'translator %s\n' "$(mkw_digest_path "$translator")"
+        printf 'script %s\n' "$(mkw_digest_path "$script")"
+        mkw_digest_tree "$workspace" projects
+        mkw_native_index_identity "$workspace"
+    } | mkw_sha256
+}
+
+# Inputs that make compiled objects unsafe to reuse: compiler/CMake/Ninja versions and the
+# from-source dependency pins. Source changes are excluded; Ninja rebuilds exactly what they touch.
+# $1 = workspace, remaining = tools (C compiler, C++ compiler, cmake, ninja).
+mkw_toolchain_identity() {
+    local workspace=$1; shift
+    local tool
+    {
+        printf 'mkw-toolchain-v2\n'
+        for tool in "$@"; do
+            # First line only: clang appends its InstalledDir, which moves with the AppImage mount.
+            printf '%s\n' "$("$tool" --version 2>/dev/null | head -n 1)"
+        done
+        mkw_digest_tree "$workspace" aurora-main/extern aurora-main/cmake
+        printf 'aurora %s\n' "$(mkw_digest_path "$workspace/aurora-main/CMakeLists.txt")"
+        printf 'mbedtls %s\n' "$(mkw_digest_path "$workspace/runtime/cmake/MbedTLSPin.cmake")"
+    } | mkw_sha256
+}
+
+# $1 = JSON file, $2 = key. Prints the recorded string value, or nothing.
+mkw_read_identity() {
+    [[ -f "$1" ]] || return 0
+    grep -o "\"$2\" *: *\"[^\"]*\"" "$1" 2>/dev/null | sed 's/.*"\([^"]*\)"$/\1/' || true
+}
+
+mkw_write_identity() {
+    printf '{"SchemaVersion":1,"%s":"%s"}\n' "$2" "$3" > "$1"
+}
+
+# Mirrors each named directory from $1 into $2. Unchanged files are left untouched so their
+# timestamps (which clang's PCH validation and Ninja compare) survive; changed and new files are
+# copied fresh and files no longer shipped are removed.
+mkw_sync_tree() {
+    local source=$1 destination=$2; shift 2
+    local dir relative changed=0 unchanged=0 removed=0
+    for dir in "$@"; do
+        if [[ ! -d "$source/$dir" ]]; then
+            rm -rf "$destination/$dir"
+            continue
+        fi
+        if [[ -e "$destination/$dir" && ! -d "$destination/$dir" ]]; then
+            rm -f "$destination/$dir"
+        fi
+        mkdir -p "$destination/$dir"
+        while IFS= read -r -d '' relative; do
+            relative=${relative#./}
+            if [[ -d "$source/$dir/$relative" ]]; then
+                [[ -d "$destination/$dir/$relative" ]] || { rm -f "$destination/$dir/$relative"; mkdir -p "$destination/$dir/$relative"; }
+            elif [[ -f "$destination/$dir/$relative" ]] && cmp -s "$source/$dir/$relative" "$destination/$dir/$relative"; then
+                unchanged=$((unchanged + 1))
+            else
+                rm -rf "$destination/$dir/$relative"
+                cp "$source/$dir/$relative" "$destination/$dir/$relative"
+                changed=$((changed + 1))
+            fi
+        done < <(cd "$source/$dir" && find . -mindepth 1 -print0)
+        while IFS= read -r -d '' relative; do
+            relative=${relative#./}
+            if [[ ! -e "$source/$dir/$relative" && ( -e "$destination/$dir/$relative" || -L "$destination/$dir/$relative" ) ]]; then
+                [[ -d "$destination/$dir/$relative" ]] || removed=$((removed + 1))
+                rm -rf "$destination/$dir/$relative"
+            fi
+        done < <(cd "$destination/$dir" && find . -mindepth 1 -depth -print0)
+    done
+    printf 'Workspace refreshed: %d changed, %d unchanged, %d removed file(s).\n' "$changed" "$unchanged" "$removed"
+}

Launcher/local-build-macos.command

@@ -4,11 +4,12 @@ set -euo pipefail
 
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 default_workspace=$(cd "$script_dir/.." && pwd)
+# shellcheck source=build-cache.sh
+source "$script_dir/build-cache.sh"
 
 fail() { printf 'local-build-macos.command: error: %s\n' "$*" >&2; exit 1; }
 step() { printf 'MKWCBUILD:STEP:%s %s\n' "$1" "$2"; }
 assert_file() { [[ -f "$1" ]] || fail "$2 is missing: $1"; }
-sha256() { shasum -a 256 "$1" | awk '{ print $1 }'; }
 
 usage() {
     cat <<'EOF'
@@ -22,17 +23,20 @@ Usage: local-build-macos.command --output-dir DIR [options]
   --retro-rewind-package-dir DIR  RetroRewind6 directory (required for Retro Rewind)
   --retro-wfc-offline-dir DIR     Directory containing binary/payload.RMCPD00.bin
   --skip-retro-wfc-payload        Build Retro Rewind without the shared Retro-WFC payload
-  --force-clean-build             Delete local generated and native-build-macos caches
+  --force-clean-build             Delete local generated and current-architecture native build caches
   --parallel N                    Pin translation and build parallelism
   --cmake PATH --ninja PATH       Override build tools
   --dotnet PATH                   Override dotnet
   --translator-bin PATH           Use a self-contained Translator.Cli executable
+  --setup-version VERSION         Version recorded in the runtime log (default: <Version> in
+                                  Launcher/Directory.Build.props when present)
 EOF
 }
 
 workspace="$default_workspace"; profile=base; output_dir=""; base_output_dir=""
 game=""; nodtool=""; retro_root=""; retro_wfc=""; skip_retro_wfc=0; force_clean=0
 parallel=0; cmake_bin=cmake; ninja_bin=ninja; dotnet_bin=dotnet; translator_bin=""
+setup_version=""
 while (($#)); do
     case "$1" in
         --workspace) workspace=${2:-}; shift 2 ;;
@@ -50,14 +54,21 @@ while (($#)); do
         --ninja) ninja_bin=${2:-}; shift 2 ;;
         --dotnet) dotnet_bin=${2:-}; shift 2 ;;
         --translator-bin) translator_bin=${2:-}; shift 2 ;;
+        --setup-version) setup_version=${2:-}; shift 2 ;;
         -h|--help) usage; exit 0 ;;
         *) fail "unknown option: $1" ;;
     esac
 done
 
 [[ $(uname -s) == Darwin ]] || fail 'this build script is for macOS only'
-[[ $(uname -m) == arm64 ]] || fail 'the current macOS product target is Apple Silicon only'
+macos_arch=$(uname -m)
+case "$macos_arch" in arm64|x86_64) ;; *) fail "unsupported macOS architecture: $macos_arch" ;; esac
+macos_deployment_target=12.0
 workspace=$(cd "$workspace" && pwd)
+if [[ -z "$setup_version" && -f "$workspace/Launcher/Directory.Build.props" ]]; then
+    setup_version=$(sed -nE 's/.*<Version>([^<]+)<\/Version>.*/\1/p' "$workspace/Launcher/Directory.Build.props" | head -n 1)
+fi
+[[ "$setup_version" =~ ^[0-9A-Za-z.+-]*$ ]] || fail '--setup-version contains unsupported characters'
 [[ -n "$output_dir" ]] || fail '--output-dir is required'
 case "$profile" in base|retro-rewind|both) ;; *) fail '--profile must be base, retro-rewind, or both' ;; esac
 builds_retro=0; [[ "$profile" != base ]] && builds_retro=1
@@ -73,7 +84,8 @@ for tool in "$cmake_bin" "$ninja_bin" clang clang++ shasum; do command -v "$tool
 
 project="$workspace/projects/mkwii/recomp.yml"; assets="$workspace/Assets"; generated="$workspace/generated"
 functions="$generated/functions"; metadata="$generated/base_translation_output.json"; manifest_dir="$workspace/build/base"
-manifest="$manifest_dir/mkwii_base_manifest.json"; shards="$generated/build_shards"; native_build="$workspace/native-build-macos"
+manifest="$manifest_dir/mkwii_base_manifest.json"; shards="$generated/build_shards"
+native_build="$workspace/native-build-macos-$macos_arch"
 assert_file "$project" 'translation project'
 if [[ -n "$game" ]]; then "$script_dir/macos/extract-disc.command" --game "$game" --assets-dir "$assets" --nodtool "$nodtool"; fi
 assert_file "$assets/main.dol" 'extracted main.dol'; assert_file "$assets/StaticR.rel" 'extracted StaticR.rel'
@@ -115,11 +127,30 @@ if (( builds_retro )); then
     fi
 fi
 
-step translate-base 'Translating the user-owned base game'
-rm -rf "$functions" "$metadata" "$manifest_dir"; mkdir -p "$functions" "$manifest_dir"
-translator translate-recursive "$entry_point" --project "$project" --outdir "$functions" --output-metadata "$metadata" --production-source-bundle "$generated/base_translation_sources.bin" --no-function-files --prune-stale --threads "$translator_threads"
-step emit-base-manifest 'Creating the local base translation manifest'
-translator emit-base-manifest --project "$project" --out "$manifest_dir" --functions-dir "$functions" --translation-output-metadata "$metadata" --region P
+translation_provenance="$generated/translation-provenance.json"
+translation_fingerprint=$(mkw_translation_identity "$workspace" "${translator_bin:-$(dirname "${translator_dll:-}")}" "$script_dir/local-build-macos.command")
+reuse_base=0
+if [[ "$(mkw_read_identity "$translation_provenance" TranslationFingerprint)" == "$translation_fingerprint" && -f "$metadata" && -f "$manifest" ]]; then
+    reuse_base=1
+fi
+if (( reuse_base && builds_retro )); then
+    # A base tree that never saw this Code.pul would bake vanilla code into the modded product.
+    pul_sha=$(mkw_sha256 "$retro_root/Binaries/Code.pul")
+    if ! grep -q "\"codePulSha256\":\"$pul_sha\"" "$metadata" && \
+       ! translator check-base-mod-awareness --project "$project" --profile retro-rewind --translation-output-metadata "$metadata" --code-pul "$retro_root/Binaries/Code.pul"; then
+        reuse_base=0
+    fi
+fi
+if (( reuse_base )); then
+    step reuse-base-translation 'Reusing the completed base translation'
+else
+    rm -f "$translation_provenance"; mkdir -p "$functions" "$manifest_dir"
+    step translate-base 'Translating the user-owned base game'
+    translator translate-recursive "$entry_point" --project "$project" --outdir "$functions" --output-metadata "$metadata" --production-source-bundle "$generated/base_translation_sources.bin" --no-function-files --prune-stale --threads "$translator_threads"
+    step emit-base-manifest 'Creating the local base translation manifest'
+    translator emit-base-manifest --project "$project" --out "$manifest_dir" --functions-dir "$functions" --translation-output-metadata "$metadata" --region P
+    mkw_write_identity "$translation_provenance" TranslationFingerprint "$translation_fingerprint"
+fi
 if (( builds_retro )); then
     mod_out="$workspace/build/mods/retro_rewind_full_cpp"; args=(translate-mod --project "$project" --profile retro-rewind --base-manifest "$manifest" --base-translation-output-metadata "$metadata" --code-pul "$retro_root/Binaries/Code.pul" --mod-root "$retro_root" --mod-name 'Retro Rewind' --region P --out "$mod_out" --prefer-cached-inputs --emit-cpp --threads "$translator_threads")
     if (( skip_retro_wfc )); then args+=(--skip-retro-wfc); else offline_payload="$retro_wfc/binary/payload.RMCPD00.bin"; assert_file "$offline_payload" 'Offline Retro-WFC payload'; args+=(--retro-wfc-payload "$offline_payload"); fi
@@ -130,10 +161,19 @@ args=(emit-build-shards --project "$project" --base-metadata "$metadata" --base-
 if (( builds_retro )); then args+=(--resolved-profile "$mod_out/resolved_dispatch_profile.json" --retro-cpp-dir "$mod_out/cpp"); fi
 step emit-build-shards 'Preparing native build shards'; translator "${args[@]}"
 
+toolchain_provenance="$native_build/toolchain-provenance.json"
+toolchain_fingerprint=$(mkw_toolchain_identity "$workspace" clang clang++ "$cmake_bin" "$ninja_bin")
+if [[ -d "$native_build" && "$(mkw_read_identity "$toolchain_provenance" ToolchainFingerprint)" != "$toolchain_fingerprint" ]]; then
+    printf 'MKWCBUILD: The toolchain or a pinned dependency changed; rebuilding the native build from scratch\n'
+    rm -rf "$native_build"
+fi
 step configure-native 'Configuring the native toolchain'
-"$cmake_bin" -S "$workspace/runtime" -B "$native_build" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_MAKE_PROGRAM="$ninja_bin" -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs"
+# Use Aurora's pinned SDL3 source on macOS.  A system SDL3 can be older than
+# Aurora's required API even when find_package() succeeds.
+"$cmake_bin" -S "$workspace/runtime" -B "$native_build" -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_MAKE_PROGRAM="$ninja_bin" -DCMAKE_OSX_ARCHITECTURES="$macos_arch" -DCMAKE_OSX_DEPLOYMENT_TARGET="$macos_deployment_target" -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs" -DAURORA_SDL3_PROVIDER=vendor -DMKW_SETUP_VERSION="$setup_version"
+mkw_write_identity "$toolchain_provenance" ToolchainFingerprint "$toolchain_fingerprint"
 targets=(); [[ "$profile" != retro-rewind ]] && targets+=(WiiCompiled); [[ "$profile" != base ]] && targets+=(RetroRewind)
 step compile "Compiling ${targets[*]} locally"; "$cmake_bin" --build "$native_build" --target "${targets[@]}" --parallel "$global_jobs"
-if [[ "$profile" != retro-rewind ]]; then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product WiiCompiled --output-dir "${base_output_dir:-$output_dir}"; fi
-if (( builds_retro )); then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product RetroRewind --output-dir "$output_dir"; fi
+if [[ "$profile" != retro-rewind ]]; then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product WiiCompiled --output-dir "${base_output_dir:-$output_dir}" --architecture "$macos_arch" --minimum-system-version "$macos_deployment_target"; fi
+if (( builds_retro )); then "$script_dir/macos/publish-app.command" --build-dir "$native_build" --product RetroRewind --output-dir "$output_dir" --architecture "$macos_arch" --minimum-system-version "$macos_deployment_target"; fi
 printf 'MKWCBUILD:OUTPUT=%s\n' "$output_dir"

Launcher/local-build.sh

@@ -39,7 +39,7 @@ require_command() {
 }
 
 sha256_of() {
-    sha256sum "$1" | awk '{print $1}'
+    mkw_sha256 "$1"
 }
 
 # ---------------------------------------------------------------------------
@@ -47,6 +47,8 @@ sha256_of() {
 # ---------------------------------------------------------------------------
 
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=build-cache.sh
+source "$script_dir/build-cache.sh"
 workspace=$(cd "$script_dir/.." && pwd)
 profile=base
 output_dir=""
@@ -66,6 +68,8 @@ translator_bin_override=""
 fuse_ld_override=""
 native_prebuilt_dir=""
 sysroot=""
+setup_version=""
+x86_cpu_profile=auto
 
 usage() {
     cat <<'EOF'
@@ -90,6 +94,10 @@ Usage: local-build.sh --output-dir DIR [options]
                                    skips compiling aurora-main from source entirely
   --sysroot PATH                   Passed to CMake as -DCMAKE_SYSROOT: where the compiler resolves
                                    standard headers/startup files
+  --setup-version VERSION          Version recorded in the runtime log (default: <Version> in
+                                   Launcher/Directory.Build.props when present)
+  --x86-cpu-profile {auto|v2|v3}   x86-64 instruction set to build for (default: auto, v3 when
+                                   this machine supports it)
 EOF
 }
 
@@ -114,16 +122,27 @@ while [[ $# -gt 0 ]]; do
         --translator-bin) translator_bin_override=$2; shift 2 ;;
         --native-prebuilt-dir) native_prebuilt_dir=$2; shift 2 ;;
         --sysroot) sysroot=$2; shift 2 ;;
+        --setup-version) setup_version=$2; shift 2 ;;
+        --x86-cpu-profile) x86_cpu_profile=$2; shift 2 ;;
         -h|--help) usage; exit 0 ;;
         *) fail "unknown argument: $1" ;;
     esac
 done
 
+if [[ -z "$setup_version" && -f "$workspace/Launcher/Directory.Build.props" ]]; then
+    setup_version=$(sed -nE 's/.*<Version>([^<]+)<\/Version>.*/\1/p' "$workspace/Launcher/Directory.Build.props" | head -n 1)
+fi
+[[ "$setup_version" =~ ^[0-9A-Za-z.+-]*$ ]] || fail "--setup-version contains unsupported characters"
+
 [[ -n "$output_dir" ]] || { usage; fail "--output-dir is required"; }
 case "$profile" in
     base|retro-rewind|both) ;;
     *) fail "--profile must be base, retro-rewind, or both" ;;
 esac
+case "$x86_cpu_profile" in
+    auto|v2|v3) ;;
+    *) fail "--x86-cpu-profile must be auto, v2, or v3" ;;
+esac
 
 builds_retro=0
 [[ "$profile" == "retro-rewind" || "$profile" == "both" ]] && builds_retro=1
@@ -173,6 +192,22 @@ if [[ -n "$native_prebuilt_dir" ]]; then
     assert_file "$native_prebuilt_dir/native_prebuilt.cmake" "Native prebuilt package"
 fi
 
+host_supports_x86_64_v3() {
+    local macros macro
+    macros=$("$cc_bin" -march=native -dM -E -x c /dev/null 2>/dev/null) || return 1
+    for macro in __AVX__ __AVX2__ __BMI__ __BMI2__ __F16C__ __FMA__ __LZCNT__ __MOVBE__; do
+        grep -q "^#define $macro " <<<"$macros" || return 1
+    done
+}
+
+if [[ "$x86_cpu_profile" == "auto" ]]; then
+    x86_cpu_profile=v3
+    if [[ "$(uname -m)" == "x86_64" ]] && ! host_supports_x86_64_v3; then
+        x86_cpu_profile=v2
+        echo "MKWCBUILD: This CPU does not support x86-64-v3; building for x86-64-v2"
+    fi
+fi
+
 project=$workspace/projects/mkwii/recomp.yml
 assets=$workspace/Assets
 generated=$workspace/generated
@@ -266,10 +301,9 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Translation cache: this script is the only owner of the reuse decision (unlike LocalBuild.ps1,
-# which is handed caller-computed fingerprints by the Windows installer - there is no Linux
-# installer yet to supply anything). Hash the game inputs the translation actually depends on;
-# a match plus every expected output file present means the previous translation is still good.
+# Translation cache: this script is the only owner of the reuse decision. The identity (see
+# build-cache.sh) covers the game inputs, project, native registrations, translator and this script,
+# matching the Windows installer's translation identity.
 # ---------------------------------------------------------------------------
 
 if (( force_clean_build )); then
@@ -277,13 +311,12 @@ if (( force_clean_build )); then
     rm -rf "$generated" "$base_manifest_dir" "$build"
 fi
 
-translation_fingerprint=$(cat "$assets/main.dol" "$assets/StaticR.rel" "$project" | sha256sum | awk '{print $1}')
+translator_identity_input=${translator_bin:-$(dirname "$translator_dll")}
+translation_fingerprint=$(mkw_translation_identity "$workspace" "$translator_identity_input" "$script_dir/local-build.sh")
 reuse_base=0
-if [[ -f "$translation_provenance" ]]; then
-    recorded=$(grep -o '"TranslationFingerprint" *: *"[^"]*"' "$translation_provenance" 2>/dev/null | sed 's/.*"\([0-9a-f]*\)"$/\1/' || true)
-    if [[ "$recorded" == "$translation_fingerprint" && -f "$base_metadata" && -f "$base_manifest" ]]; then
-        reuse_base=1
-    fi
+if [[ "$(mkw_read_identity "$translation_provenance" TranslationFingerprint)" == "$translation_fingerprint" \
+      && -f "$base_metadata" && -f "$base_manifest" ]]; then
+    reuse_base=1
 fi
 
 if (( builds_retro )); then
@@ -331,8 +364,7 @@ else
     translator emit-base-manifest --project "$project" --out "$base_manifest_dir" \
         --functions-dir "$functions" --translation-output-metadata "$base_metadata" --region P
 
-    printf '{"SchemaVersion":1,"TranslationFingerprint":"%s"}' "$translation_fingerprint" \
-        > "$translation_provenance"
+    mkw_write_identity "$translation_provenance" TranslationFingerprint "$translation_fingerprint"
 fi
 
 if (( builds_retro )); then
@@ -407,6 +439,13 @@ if [[ -f "$build/CMakeCache.txt" ]]; then
         done < <(grep -o ':FILEPATH=.*' "$build/CMakeCache.txt" | sed 's/^:FILEPATH=//')
     fi
 fi
+# The AppImage keeps tool paths stable across updates, so a changed compiler is only visible here.
+toolchain_fingerprint=$(mkw_toolchain_identity "$workspace" "$cc_bin" "$cxx_bin" "$cmake_bin" "$ninja_bin")
+if [[ "$keep_native_build" -eq 1 && \
+      "$(mkw_read_identity "$toolchain_provenance" ToolchainFingerprint)" != "$toolchain_fingerprint" ]]; then
+    keep_native_build=0
+    stale_reason=" (the toolchain or a pinned dependency changed)"
+fi
 if [[ -d "$build" && "$keep_native_build" -eq 0 ]]; then
     echo "MKWCBUILD: The native build cache does not belong to this workspace path or toolchain; rebuilding from scratch$stale_reason"
     rm -rf "$build"
@@ -418,7 +457,9 @@ configure_args=(-S "$workspace/runtime" -B "$build" -G Ninja
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_C_COMPILER="$cc_bin" -DCMAKE_CXX_COMPILER="$cxx_bin"
     -DCMAKE_MAKE_PROGRAM="$ninja_bin"
-    -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs")
+    -DMKW_TRANSLATED_COMPILE_JOBS="$translated_jobs"
+    -DMKW_SETUP_VERSION="$setup_version"
+    -DMKW_X86_CPU_PROFILE="$x86_cpu_profile")
 # CMAKE_C_COMPILER/CXX_COMPILER stay stable across AppImage runs on their own (they're exactly
 # what's passed via -D above, and AppRun points --cc/--cxx at a symlink it re-targets at the
 # current mount every launch - see build-appimage.sh). CMAKE_AR/RANLIB/LINKER/ASM_COMPILER do NOT
@@ -437,7 +478,9 @@ if [[ "$cc_bin" == */* ]]; then
     configure_args+=(-DCMAKE_ASM_COMPILER="$cc_bin")
 fi
 if [[ -n "$fuse_ld_override" ]]; then
-    configure_args+=(-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=$fuse_ld_override")
+    # CMAKE_EXE_LINKER_FLAGS is one string that CMake pastes into the shell link command.
+    printf -v fuse_ld_quoted '%q' "$fuse_ld_override"
+    configure_args+=(-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=$fuse_ld_quoted")
 fi
 if [[ -n "$native_prebuilt_dir" ]]; then
     configure_args+=(-DMKW_NATIVE_PREBUILT_DIR="$native_prebuilt_dir")
@@ -453,6 +496,7 @@ fi
 
 log_step configure-native "Configuring the native toolchain"
 "$cmake_bin" "${configure_args[@]}"
+mkw_write_identity "$toolchain_provenance" ToolchainFingerprint "$toolchain_fingerprint"
 
 case "$profile" in
     base) targets=(WiiCompiled) ;;

Launcher/macos/build-setup-pkg.command

@@ -9,45 +9,97 @@ fail() { printf 'build-setup-pkg.command: error: %s\n' "$*" >&2; exit 1; }
 copy_clean() { DITTONORSRC=1 ditto --norsrc --noqtn "$@"; }
 usage() {
     cat <<'EOF'
-Usage: build-setup-pkg.command --nodtool PATH --translator PATH --cmake-root DIR --ninja PATH --output PKG [options]
+Usage: build-setup-pkg.command --nodtool-arm64 PATH --nodtool-x86_64 PATH --translator-arm64 PATH --translator-x86_64 PATH --cmake-root DIR --ninja-arm64 PATH --ninja-x86_64 PATH --output PKG [options]
 
 Creates a game-code-free WiiCompiled Setup.pkg. The supplied tools must be
-maintainer-verified, redistributable macOS arm64 artifacts. The resulting pkg
-is unsigned unless --installer-identity is supplied; releases should sign and
-notarize it with a Developer ID Installer certificate.
+maintainer-verified, redistributable macOS artifacts for both arm64 and
+x86_64. The setup package selects native tools for its host while the game is
+compiled locally for that host architecture. CMake must be universal2. The
+resulting pkg is unsigned unless
+--installer-identity is supplied; releases should sign and notarize it with a
+Developer ID Installer certificate.
 
   --workspace DIR             Repository root (default: script's grandparent)
-  --version VERSION           Bundle/package version (default: 0.1.0)
+  --version VERSION           Bundle/package version (default: project version, or 0.1.0)
   --installer-identity NAME   Developer ID Installer identity for productbuild
 EOF
 }
 
 script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-workspace=$(cd "$script_dir/../.." && pwd); nodtool=""; translator=""; cmake_root=""; ninja=""; output=""; version=0.1.0; identity=""
+workspace=$(cd "$script_dir/../.." && pwd); nodtool_arm64=""; nodtool_x86_64=""; translator_arm64=""; translator_x86_64=""; cmake_root=""; ninja_arm64=""; ninja_x86_64=""; output=""; version=0.1.0; identity=""
+version_supplied=false
 while (($#)); do
     case "$1" in
         --workspace) workspace=${2:-}; shift 2 ;;
-        --nodtool) nodtool=${2:-}; shift 2 ;;
-        --translator) translator=${2:-}; shift 2 ;;
+        --nodtool-arm64) nodtool_arm64=${2:-}; shift 2 ;;
+        --nodtool-x86_64) nodtool_x86_64=${2:-}; shift 2 ;;
+        --translator-arm64) translator_arm64=${2:-}; shift 2 ;;
+        --translator-x86_64) translator_x86_64=${2:-}; shift 2 ;;
         --cmake-root) cmake_root=${2:-}; shift 2 ;;
-        --ninja) ninja=${2:-}; shift 2 ;;
+        --ninja-arm64) ninja_arm64=${2:-}; shift 2 ;;
+        --ninja-x86_64) ninja_x86_64=${2:-}; shift 2 ;;
         --output) output=${2:-}; shift 2 ;;
-        --version) version=${2:-}; shift 2 ;;
+        --version) version=${2:-}; version_supplied=true; shift 2 ;;
         --installer-identity) identity=${2:-}; shift 2 ;;
         -h|--help) usage; exit 0 ;;
         *) fail "unknown option: $1" ;;
     esac
 done
 version=${version#v}
+if [[ "$version_supplied" == false ]]; then
+    local_csproj="$workspace/Launcher/Directory.Build.props"
+    if [[ -f "$local_csproj" ]]; then
+        detected=$(grep -m1 '<Version>' "$local_csproj" | sed -E 's/.*<Version>([^<]+)<\/Version>.*/\1/' || true)
+        if [[ -n "$detected" ]]; then
+            version="$detected"
+        fi
+    fi
+fi
 [[ "$version" =~ ^[0-9]+(\.[0-9]+){0,2}$ ]] || fail '--version must contain one to three period-separated integers'
 IFS=. read -r version_major version_minor version_patch <<< "$version"
 short_version="$version_major.${version_minor:-0}.${version_patch:-0}"
-for tool in pkgbuild productbuild ditto codesign; do command -v "$tool" >/dev/null || fail "required macOS tool unavailable: $tool"; done
-[[ -x "$nodtool" ]] || fail '--nodtool must name an executable'
-[[ -x "$translator" ]] || fail '--translator must name an executable'
+for tool in pkgbuild productbuild ditto codesign lipo; do command -v "$tool" >/dev/null || fail "required macOS tool unavailable: $tool"; done
+for tool_path in "$nodtool_arm64" "$nodtool_x86_64" "$translator_arm64" "$translator_x86_64" "$ninja_arm64" "$ninja_x86_64"; do [[ -x "$tool_path" ]] || fail 'each architecture-specific tool must name an executable'; done
 [[ -x "$cmake_root/bin/cmake" ]] || fail '--cmake-root must contain bin/cmake'
-[[ -x "$ninja" ]] || fail '--ninja must name an executable'
-"$nodtool" --version >/dev/null || fail '--nodtool did not run successfully'
+require_arch() {
+    local artifact=$1 arch=$2 label=$3
+    lipo "$artifact" -verify_arch "$arch" >/dev/null 2>&1 || fail "$label must contain a $arch slice: $artifact"
+}
+require_arch "$nodtool_arm64" arm64 '--nodtool-arm64'; require_arch "$nodtool_x86_64" x86_64 '--nodtool-x86_64'
+require_arch "$translator_arm64" arm64 '--translator-arm64'; require_arch "$translator_x86_64" x86_64 '--translator-x86_64'
+require_arch "$ninja_arm64" arm64 '--ninja-arm64'; require_arch "$ninja_x86_64" x86_64 '--ninja-x86_64'
+lipo "$cmake_root/bin/cmake" -verify_arch arm64 x86_64 >/dev/null 2>&1 || fail '--cmake-root/bin/cmake must be universal2'
+
+# Slice checks above prevent accidental cross-architecture packaging. Exercise
+# each supplied executable as well: an incorrectly bundled runtime can have a
+# valid Mach-O header but still fail before the setup app can use it. Apple
+# Silicon maintainers validate Intel tools through Rosetta when it is present.
+host_arch=$(uname -m)
+run_for_arch() {
+    local arch=$1 label=$2
+    shift 2
+    if [[ "$arch" == "$host_arch" ]]; then
+        "$@" >/dev/null || fail "$label did not run successfully"
+    elif [[ "$host_arch" == arm64 && "$arch" == x86_64 ]] && /usr/bin/arch -x86_64 /usr/bin/true >/dev/null 2>&1; then
+        /usr/bin/arch -x86_64 "$@" >/dev/null || fail "$label did not run successfully under Rosetta"
+    else
+        # Intel hosts cannot execute arm64 binaries. The slice remains checked
+        # above; CI or an Apple Silicon maintainer must execute that tool set.
+        printf 'build-setup-pkg.command: warning: unable to execute %s on %s; architecture slice was verified, but run it in %s CI before release\n' \
+            "$label" "$host_arch" "$arch" >&2
+    fi
+}
+for arch in arm64 x86_64; do
+    if [[ "$arch" == arm64 ]]; then
+        nodtool=$nodtool_arm64; translator=$translator_arm64; ninja=$ninja_arm64
+    else
+        nodtool=$nodtool_x86_64; translator=$translator_x86_64; ninja=$ninja_x86_64
+    fi
+    run_for_arch "$arch" "--nodtool-$arch" "$nodtool" --version
+    run_for_arch "$arch" "--translator-$arch" "$translator" --help
+    run_for_arch "$arch" "--ninja-$arch" "$ninja" --version
+done
+run_for_arch "$host_arch" '--cmake-root/bin/cmake' "$cmake_root/bin/cmake" --version
 workspace=$(cd "$workspace" && pwd); output=$(cd "$(dirname "$output")" && pwd)/$(basename "$output")
 stage=$(mktemp -d "${TMPDIR:-/tmp}/wiicompiled-pkg.XXXXXX")
 trap 'rm -rf "$stage"' EXIT
@@ -64,7 +116,7 @@ cat > "$app/Contents/Info.plist" <<EOF
 <key>CFBundlePackageType</key><string>APPL</string>
 <key>CFBundleShortVersionString</key><string>$short_version</string>
 <key>CFBundleVersion</key><string>$version</string>
-<key>LSMinimumSystemVersion</key><string>14.0</string>
+<key>LSMinimumSystemVersion</key><string>12.0</string>
 </dict></plist>
 EOF
 cat > "$app/Contents/MacOS/WiiCompiledSetup" <<'EOF'
@@ -96,18 +148,36 @@ copy_clean "$script_dir/setup.command" "$resources/setup.command"; chmod +x "$re
 mkdir -p "$resources/workspace"
 for source in aurora-main projects runtime translator; do
     [[ -d "$workspace/$source" ]] || fail "required workspace directory is missing: $source"
+    [[ "$source" != aurora-main || -f "$workspace/$source/CMakeLists.txt" ]] ||
+        fail "aurora-main is empty; run git submodule update --init --recursive"
     copy_clean "$workspace/$source" "$resources/workspace/$source"
 done
+# Setup bundles contain materialized sources and must work without Git.
+find "$resources/workspace" -name .git -prune -exec rm -rf {} +
+# The translation identity (build-cache.sh) covers the runtime's native registrations through this
+# index, so it is extracted from exactly the packaged runtime sources.
+if [[ "$host_arch" == arm64 ]]; then host_translator=$translator_arm64; else host_translator=$translator_x86_64; fi
+"$host_translator" emit-native-index --native-source-dir "$resources/workspace/runtime/src" \
+    --out "$resources/workspace/runtime/native-index.json" || fail 'the runtime native index could not be extracted'
+[[ -f "$resources/workspace/runtime/native-index.json" ]] || fail 'the runtime native index was not written'
 mkdir -p "$resources/workspace/Launcher/macos"
+copy_clean "$workspace/Launcher/Directory.Build.props" "$resources/workspace/Launcher/Directory.Build.props"
 copy_clean "$workspace/Launcher/local-build-macos.command" "$resources/workspace/Launcher/local-build-macos.command"
+copy_clean "$workspace/Launcher/build-cache.sh" "$resources/workspace/Launcher/build-cache.sh"
 copy_clean "$workspace/Launcher/macos/extract-disc.command" "$resources/workspace/Launcher/macos/extract-disc.command"
 copy_clean "$workspace/Launcher/macos/publish-app.command" "$resources/workspace/Launcher/macos/publish-app.command"
 chmod +x "$resources/workspace/Launcher/local-build-macos.command" "$resources/workspace/Launcher/macos/"*.command
-mkdir -p "$resources/tools/cmake"
-copy_clean "$nodtool" "$resources/tools/nodtool"; chmod +x "$resources/tools/nodtool"
-copy_clean "$translator" "$resources/tools/Translator.Cli"; chmod +x "$resources/tools/Translator.Cli"
+# setup.command uses this marker to update source inputs in an existing user
+# workspace without replacing extracted game assets or Retro Rewind files.
+printf '%s\n' "$version" > "$resources/workspace/.bundle-version"
+mkdir -p "$resources/tools/cmake" "$resources/tools/arm64" "$resources/tools/x86_64"
+copy_clean "$nodtool_arm64" "$resources/tools/arm64/nodtool"; chmod +x "$resources/tools/arm64/nodtool"
+copy_clean "$nodtool_x86_64" "$resources/tools/x86_64/nodtool"; chmod +x "$resources/tools/x86_64/nodtool"
+copy_clean "$translator_arm64" "$resources/tools/arm64/Translator.Cli"; chmod +x "$resources/tools/arm64/Translator.Cli"
+copy_clean "$translator_x86_64" "$resources/tools/x86_64/Translator.Cli"; chmod +x "$resources/tools/x86_64/Translator.Cli"
 copy_clean "$cmake_root" "$resources/tools/cmake"
-copy_clean "$ninja" "$resources/tools/ninja"; chmod +x "$resources/tools/ninja"
+copy_clean "$ninja_arm64" "$resources/tools/arm64/ninja"; chmod +x "$resources/tools/arm64/ninja"
+copy_clean "$ninja_x86_64" "$resources/tools/x86_64/ninja"; chmod +x "$resources/tools/x86_64/ninja"
 copy_clean "$workspace/LICENSE" "$resources/LICENSE"
 copy_clean "$workspace/THIRD-PARTY-NOTICES.md" "$resources/THIRD-PARTY-NOTICES.md"
 codesign --force --deep --sign - "$app"

Launcher/macos/extract-disc.command

@@ -38,6 +38,16 @@ done
 [[ -x "$nodtool" ]] || fail "nodtool is not executable: $nodtool"
 
 assets_dir=$(mkdir -p "$assets_dir" && cd "$assets_dir" && pwd)
+
+# Sorted "<size> <path>" of every extracted file; recorded at extraction, compared on reuse.
+data_manifest() { (cd "$1" && find . -type f -print0 | LC_ALL=C sort -z | xargs -0 stat -f '%z %N'); }
+
+if [[ -d "$assets_dir/DATA/files" && -f "$assets_dir/.data-manifest" && -f "$assets_dir/main.dol" && -f "$assets_dir/StaticR.rel" ]] && \
+   [[ $(sha256 "$assets_dir/main.dol") == "$EXPECTED_DOL_SHA256" && $(sha256 "$assets_dir/StaticR.rel") == "$EXPECTED_REL_SHA256" ]] && \
+   [[ "$(data_manifest "$assets_dir/DATA")" == "$(cat "$assets_dir/.data-manifest")" ]]; then
+    printf 'MKWCBUILD:STEP:disc-ready Reusing the verified extracted game assets\n'
+    exit 0
+fi
 scratch=$(mktemp -d "${TMPDIR:-/tmp}/wiicompiled-disc.XXXXXX")
 cleanup() { rm -rf "$scratch"; }
 trap cleanup EXIT
@@ -51,8 +61,10 @@ dol=$(find "$scratch/extracted" -type f -path '*/sys/main.dol' -print -quit)
 rel=$(find "$scratch/extracted" -type f -path '*/files/rel/StaticR.rel' -print -quit)
 [[ -n "$dol" ]] || fail 'nodtool extraction did not contain sys/main.dol'
 [[ -n "$rel" ]] || fail 'nodtool extraction did not contain files/rel/StaticR.rel'
-[[ $(sha256 "$dol") == "$EXPECTED_DOL_SHA256" ]] || fail 'disc is not the supported clean PAL RMCP01 Mario Kart Wii image'
-[[ $(sha256 "$rel") == "$EXPECTED_REL_SHA256" ]] || fail 'disc has an unexpected StaticR.rel; use a clean PAL RMCP01 image'
+dol_sha=$(sha256 "$dol")
+rel_sha=$(sha256 "$rel")
+[[ $dol_sha == "$EXPECTED_DOL_SHA256" ]] || fail "main.dol does not match the clean PAL RMCP01 image (expected $EXPECTED_DOL_SHA256, got $dol_sha)"
+[[ $rel_sha == "$EXPECTED_REL_SHA256" ]] || fail "StaticR.rel does not match the clean PAL RMCP01 image (expected $EXPECTED_REL_SHA256, got $rel_sha)"
 
 data_root=$(dirname "$(dirname "$dol")")
 [[ -d "$data_root/files" ]] || fail 'nodtool extraction did not contain the Wii files directory'
@@ -64,15 +76,17 @@ mkdir -p "$stage"
 ditto "$data_root" "$stage/DATA"
 ditto "$dol" "$stage/main.dol"
 ditto "$rel" "$stage/StaticR.rel"
+data_manifest "$stage/DATA" > "$stage/.data-manifest"
 
 backup="$assets_dir/.previous-extraction-$(date +%Y%m%d-%H%M%S)"
-if [[ -e "$assets_dir/DATA" || -e "$assets_dir/main.dol" || -e "$assets_dir/StaticR.rel" ]]; then
+if [[ -e "$assets_dir/DATA" || -e "$assets_dir/.data-manifest" || -e "$assets_dir/main.dol" || -e "$assets_dir/StaticR.rel" ]]; then
     mkdir -p "$backup"
-    for item in DATA main.dol StaticR.rel; do
+    for item in DATA .data-manifest main.dol StaticR.rel; do
         [[ -e "$assets_dir/$item" ]] && mv "$assets_dir/$item" "$backup/$item"
     done
 fi
 mv "$stage/DATA" "$assets_dir/DATA"
+mv "$stage/.data-manifest" "$assets_dir/.data-manifest"
 mv "$stage/main.dol" "$assets_dir/main.dol"
 mv "$stage/StaticR.rel" "$assets_dir/StaticR.rel"
 rmdir "$stage"

Launcher/macos/macos-x86_64-toolchain.cmake

@@ -0,0 +1,11 @@
+# Cross-compile a thin x86_64 macOS build from an Apple Silicon Mac.
+# Pass this file on the first configure with:
+#   -DCMAKE_TOOLCHAIN_FILE=/absolute/path/to/macos-x86_64-toolchain.cmake
+#
+# CMAKE_SYSTEM_PROCESSOR is deliberately declared here rather than inferred
+# from CMAKE_OSX_ARCHITECTURES, so target-aware CMake dependencies select their
+# x86_64 artifacts.
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
+    "Target macOS architectures" FORCE)

Launcher/macos/publish-app.command

@@ -5,28 +5,36 @@ set -euo pipefail
 fail() { printf 'publish-app.command: error: %s\n' "$*" >&2; exit 1; }
 usage() {
     cat <<'EOF'
-Usage: publish-app.command --build-dir DIR --product {WiiCompiled|RetroRewind} --output-dir DIR
+Usage: publish-app.command --build-dir DIR --product {WiiCompiled|RetroRewind} --output-dir DIR [options]
 
 Copies a locally built product and its runtime assets into OUTPUT-DIR/<product>.app.
 It bundles non-system dylibs, rewrites their install names, and ad-hoc signs the
 result. This is suitable for local use; a release must replace ad-hoc signing
 with the project's Developer ID signing and notarization process.
+
+  --architecture {arm64|x86_64}       Required architecture of the compiled product (default: host)
+  --minimum-system-version VERSION    App bundle minimum macOS version (default: 12.0)
 EOF
 }
 
-build_dir=""; product=""; output_dir=""
+build_dir=""; product=""; output_dir=""; architecture=$(uname -m); minimum_system_version=12.0
 while (($#)); do
     case "$1" in
         --build-dir) build_dir=${2:-}; shift 2 ;;
         --product) product=${2:-}; shift 2 ;;
         --output-dir) output_dir=${2:-}; shift 2 ;;
+        --architecture) architecture=${2:-}; shift 2 ;;
+        --minimum-system-version) minimum_system_version=${2:-}; shift 2 ;;
         -h|--help) usage; exit 0 ;;
         *) fail "unknown option: $1" ;;
     esac
 done
 [[ "$product" == WiiCompiled || "$product" == RetroRewind ]] || fail '--product must be WiiCompiled or RetroRewind'
-for tool in codesign ditto install_name_tool otool; do command -v "$tool" >/dev/null || fail "required macOS tool is unavailable: $tool"; done
+[[ "$architecture" == arm64 || "$architecture" == x86_64 ]] || fail '--architecture must be arm64 or x86_64'
+[[ "$minimum_system_version" =~ ^[0-9]+(\.[0-9]+){1,2}$ ]] || fail '--minimum-system-version must contain two or three period-separated integers'
+for tool in codesign ditto install_name_tool lipo otool; do command -v "$tool" >/dev/null || fail "required macOS tool is unavailable: $tool"; done
 [[ -x "$build_dir/$product" ]] || fail "missing compiled product: $build_dir/$product"
+lipo "$build_dir/$product" -verify_arch "$architecture" || fail "compiled product is not $architecture: $build_dir/$product"
 for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem wii_bootstrap; do [[ -e "$build_dir/$asset" ]] || fail "missing runtime asset: $build_dir/$asset"; done
 
 app="$output_dir/$product.app"
@@ -47,7 +55,7 @@ cat > "$app/Contents/Info.plist" <<EOF
   <key>CFBundlePackageType</key><string>APPL</string>
   <key>CFBundleShortVersionString</key><string>0.1.0</string>
   <key>CFBundleVersion</key><string>1</string>
-  <key>LSMinimumSystemVersion</key><string>14.0</string>
+  <key>LSMinimumSystemVersion</key><string>$minimum_system_version</string>
   <key>NSHighResolutionCapable</key><true/>
 </dict></plist>
 EOF
@@ -57,25 +65,96 @@ for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem wii_bootstrap; do
     ln -s "../Resources/$asset" "$macos/$asset"
 done
 
-# Build a closure of Homebrew dylibs. System libraries remain system references.
-queue=("$macos/$product")
+# Expand each image's rpaths before inheriting them, so @loader_path stays
+# relative to the image that declared it rather than a descendant library.
+expanded_rpaths() {
+    local target=$1 rpath
+    while IFS= read -r rpath; do
+        case "$rpath" in
+            @loader_path/*) rpath="$(dirname "$target")/${rpath#@loader_path/}" ;;
+            @loader_path) rpath="$(dirname "$target")" ;;
+            @executable_path/*) rpath="$build_dir/${rpath#@executable_path/}" ;;
+            @executable_path) rpath="$build_dir" ;;
+        esac
+        printf '%s\n' "$rpath"
+    done < <(otool -l "$target" | awk '
+/LC_RPATH/ { rpath = 1; next }
+rpath && /^[[:space:]]*path / {
+    sub(/^[[:space:]]*path[[:space:]]+/, "");
+    sub(/[[:space:]]+\(offset[[:space:]]+[0-9]+\)$/, "");
+    print;
+    rpath = 0;
+}')
+}
+
+# Resolve a non-system dependency using the current image's rpaths followed
+# by the inherited loader stack, matching dyld's dependency-chain search.
+dependency_path() {
+    local current=$1 dependency=$2 search_rpaths=$3 rpath candidate
+    case "$dependency" in
+        /System/Library/*|/usr/lib/*)
+            return 1
+            ;;
+        /*)
+            [[ -f "$dependency" ]] && { printf '%s\n' "$dependency"; return 0; }
+            ;;
+        @loader_path/*)
+            candidate="$(dirname "$current")/${dependency#@loader_path/}"
+            [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
+            ;;
+        @executable_path/*)
+            candidate="$build_dir/${dependency#@executable_path/}"
+            [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
+            ;;
+        @rpath/*|*.dylib)
+            local subpath
+            if [[ "$dependency" == @rpath/* ]]; then
+                subpath="${dependency#@rpath/}"
+            else
+                subpath="$dependency"
+            fi
+            while IFS= read -r rpath; do
+                [[ -n "$rpath" ]] || continue
+                candidate="$rpath/$subpath"
+                [[ -f "$candidate" ]] && { printf '%s\n' "$candidate"; return 0; }
+            done <<< "$search_rpaths"
+            ;;
+    esac
+    return 1
+}
+
+# Build a closure of non-system dylibs. System libraries remain system
+# references, while every resolved dependency is copied beside the executable.
+queue=("$build_dir/$product")
+queue_rpaths=("")
 while ((${#queue[@]})); do
     current=${queue[0]}
+    inherited_rpaths=${queue_rpaths[0]}
     queue=("${queue[@]:1}")
+    queue_rpaths=("${queue_rpaths[@]:1}")
+    current_rpaths=$(expanded_rpaths "$current")
+    if [[ -n "$inherited_rpaths" ]]; then
+        current_rpaths="${current_rpaths}${current_rpaths:+$'\n'}$inherited_rpaths"
+    fi
+    self_id=$(otool -D "$current" 2>/dev/null | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]*$/\1/p' || true)
     while IFS= read -r dependency; do
-        [[ "$dependency" == /opt/homebrew/* || "$dependency" == /usr/local/* ]] || continue
-        [[ -f "$dependency" ]] || continue
-        name=$(basename "$dependency")
+        [[ -z "$dependency" ]] && continue
+        [[ -n "$self_id" && "$dependency" == "$self_id" ]] && continue
+        case "$dependency" in
+            /System/Library/*|/usr/lib/*) continue ;;
+        esac
+        dep_path=$(dependency_path "$current" "$dependency" "$current_rpaths") || fail "unresolved non-system dependency: '$dependency' needed by '$current'"
+        name=$(basename "$dep_path")
         if [[ ! -f "$frameworks/$name" ]]; then
-            ditto "$dependency" "$frameworks/$name"
+            ditto "$dep_path" "$frameworks/$name"
             install_name_tool -id "@rpath/$name" "$frameworks/$name"
-            queue+=("$frameworks/$name")
+            queue+=("$dep_path")
+            queue_rpaths+=("$current_rpaths")
         fi
-    done < <(otool -L "$current" | tail -n +2 | awk '{print $1}')
+    done < <(otool -L "$current" | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]+\(compatibility version .*/\1/p')
 done
 while IFS= read -r binary; do
     while IFS= read -r old; do
-        [[ "$old" == /opt/homebrew/* || "$old" == /usr/local/* ]] || continue
         name=$(basename "$old")
         [[ -f "$frameworks/$name" ]] || continue
         if [[ "$binary" == "$macos/$product" ]]; then
@@ -83,7 +162,7 @@ while IFS= read -r binary; do
         else
             install_name_tool -change "$old" "@loader_path/$name" "$binary"
         fi
-    done < <(otool -L "$binary" | tail -n +2 | awk '{print $1}')
+    done < <(otool -L "$binary" | tail -n +2 | sed -nE 's/^[[:space:]]*(.*)[[:space:]]+\(compatibility version .*/\1/p')
 done < <(find "$frameworks" -type f -print; printf '%s\n' "$macos/$product")
 
 find "$frameworks" -type f -exec codesign --force --sign - {} +

Launcher/macos/setup.command

@@ -5,16 +5,19 @@ set -euo pipefail
 
 resources=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 workspace_source="$resources/workspace"
-nodtool="$resources/tools/nodtool"
-translator="$resources/tools/Translator.Cli"
 cmake_bin="$resources/tools/cmake/bin/cmake"
-ninja_bin="$resources/tools/ninja"
 support_root="$HOME/Library/Application Support/WiiCompiled"
 workspace="$support_root/BuildWorkspace"
 products="$support_root/Products"
 
 fail() { printf 'WiiCompiled Setup: %s\n' "$*" >&2; exit 1; }
-notice() { /usr/bin/osascript -e "display dialog \"${1//\"/\\\"}\" buttons {\"OK\"} default button \"OK\" with icon caution" >/dev/null; }
+notice() {
+    /usr/bin/osascript - "$1" >/dev/null <<'APPLESCRIPT'
+on run argv
+    display dialog (item 1 of argv) buttons {"OK"} default button "OK" with icon caution
+end run
+APPLESCRIPT
+}
 usage() {
     cat <<'EOF'
 Usage: setup.command --game IMAGE [--retro-dir DIR] [--install-location {user|applications}]
@@ -36,6 +39,13 @@ while (($#)); do
 done
 [[ "$install_location" == user || "$install_location" == applications ]] || fail '--install-location must be user or applications'
 
+host_arch=$(uname -m)
+case "$host_arch" in arm64|x86_64) ;; *) fail "unsupported macOS architecture: $host_arch" ;; esac
+host_tools="$resources/tools/$host_arch"
+nodtool="$host_tools/nodtool"
+translator="$host_tools/Translator.Cli"
+ninja_bin="$host_tools/ninja"
+
 if [[ -z "$game" ]]; then
     game=$(/usr/bin/osascript <<'APPLESCRIPT'
 set selectedFile to choose file with prompt "Choose your clean Mario Kart Wii PAL (RMCP01) disc image"
@@ -60,12 +70,34 @@ if ! /usr/bin/xcode-select -p >/dev/null 2>&1; then
     /usr/bin/xcode-select --install || true
     exit 1
 fi
+for tool in "$nodtool" "$translator" "$cmake_bin" "$ninja_bin"; do
+    /usr/bin/lipo "$tool" -verify_arch "$host_arch" >/dev/null 2>&1 || \
+        fail "the packaged $(basename "$tool") does not support $host_arch"
+done
 
 mkdir -p "$support_root" "$products"
-if [[ ! -d "$workspace/.git" && ! -f "$workspace/projects/mkwii/recomp.yml" ]]; then
+source_bundle_version="$workspace_source/.bundle-version"
+workspace_bundle_version="$workspace/.bundle-version"
+needs_workspace_refresh=0
+if [[ ! -f "$workspace/projects/mkwii/recomp.yml" ]]; then
+    needs_workspace_refresh=1
+elif [[ -f "$source_bundle_version" ]] && [[ ! -f "$workspace_bundle_version" || "$(<"$source_bundle_version")" != "$(<"$workspace_bundle_version")" ]]; then
+    needs_workspace_refresh=1
+fi
+
+if (( needs_workspace_refresh )); then
     printf 'Preparing the local build workspace...\n'
-    rm -rf "$workspace"
-    /usr/bin/ditto "$workspace_source" "$workspace"
+    if [[ ! -d "$workspace" ]]; then
+        /usr/bin/ditto "$workspace_source" "$workspace"
+    else
+        # Refresh only packaged source inputs. Assets and the staged Retro
+        # Rewind package belong to the user and stay in place; unchanged files
+        # keep their timestamps so the incremental native build survives.
+        # shellcheck source=../build-cache.sh
+        source "$workspace_source/Launcher/build-cache.sh"
+        mkw_sync_tree "$workspace_source" "$workspace" aurora-main projects runtime translator Launcher
+        /usr/bin/ditto "$source_bundle_version" "$workspace_bundle_version"
+    fi
 fi
 
 profile=base
@@ -77,33 +109,47 @@ if [[ -n "$retro_dir" ]]; then
     # verify its pinned signature before publishing it into the local cache.
     retro_wfc_dir="$support_root/RetroWfcPayload"
     retro_wfc_payload="$retro_wfc_dir/binary/payload.RMCPD00.bin"
-    if [[ -f "$retro_wfc_payload" ]] && ! "$translator" validate-retro-wfc-payload --directory "$retro_wfc_dir"; then
-        printf 'Discarding an invalid cached Retro-WFC payload...\n' >&2
-        rm -f "$retro_wfc_payload"
+    cached_payload_valid=0
+    if [[ -f "$retro_wfc_payload" ]]; then
+        if "$translator" validate-retro-wfc-payload --directory "$retro_wfc_dir"; then
+            cached_payload_valid=1
+        else
+            printf 'Discarding an invalid cached Retro-WFC payload...\n' >&2
+            rm -f "$retro_wfc_payload"
+        fi
     fi
-    if [[ ! -f "$retro_wfc_payload" ]]; then
-        printf 'Downloading the Retro-WFC payload needed for online play...\n'
-        mkdir -p "$retro_wfc_dir"
-        payload_stage=$(mktemp -d "$retro_wfc_dir/.payload-download.XXXXXX")
-        temporary_payload="$payload_stage/binary/payload.RMCPD00.bin"
-        mkdir -p "$(dirname "$temporary_payload")"
-        trap 'rm -rf "$payload_stage"' EXIT
-        /usr/bin/curl --fail --silent --show-error --connect-timeout 10 --max-time 30 \
-            --retry 1 --output "$temporary_payload" \
-            'https://rwfc.net/api/wfc/payload?g=RMCPD00' || fail 'could not download the Retro-WFC payload needed for online play'
+
+    # A signed cache may still be an older vulnerable revision, so always attempt to replace it
+    # with the current signed snapshot. A transport failure may fall back to the verified cache;
+    # a downloaded snapshot with an invalid signature remains a hard failure.
+    printf 'Downloading the current Retro-WFC payload needed for online play...\n'
+    mkdir -p "$retro_wfc_dir"
+    payload_stage=$(mktemp -d "$retro_wfc_dir/.payload-download.XXXXXX")
+    temporary_payload="$payload_stage/binary/payload.RMCPD00.bin"
+    mkdir -p "$(dirname "$temporary_payload")"
+    trap 'rm -rf "$payload_stage"' EXIT
+    if /usr/bin/curl --fail --silent --show-error --connect-timeout 10 --max-time 30 \
+        --retry 1 --output "$temporary_payload" \
+        'https://rwfc.net/api/wfc/payload?g=RMCPD00'; then
         "$translator" validate-retro-wfc-payload --directory "$payload_stage" || \
             fail 'downloaded Retro-WFC payload failed signature validation'
         mkdir -p "$retro_wfc_dir/binary"
         mv "$temporary_payload" "$retro_wfc_payload"
         rmdir "$payload_stage/binary" "$payload_stage"
         trap - EXIT
+    elif (( cached_payload_valid )); then
+        printf 'Could not download the current Retro-WFC payload; using the previously verified cached payload.\n' >&2
+        rm -rf "$payload_stage"
+        trap - EXIT
+    else
+        fail 'could not download the current Retro-WFC payload and no valid cached payload is available'
     fi
     build_args+=(--profile both --base-output-dir "$products" --retro-rewind-package-dir "$retro_dir" --retro-wfc-offline-dir "$retro_wfc_dir")
 fi
 "$workspace/Launcher/local-build-macos.command" "${build_args[@]}" --profile "$profile" --cmake "$cmake_bin" --ninja "$ninja_bin" --translator-bin "$translator"
 
 config="$support_root/Config.toml"
-toml_string() { printf '%s' "$1" | sed -e 's/\\\\/\\\\\\\\/g' -e 's/"/\\\\"/g'; }
+toml_string() { printf '%s' "$1" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g'; }
 set_path() {
     local key=$1 value=$2 encoded line temporary
     encoded=$(toml_string "$value"); line="$key = \"$encoded\""; temporary="$config.tmp"
@@ -129,8 +175,13 @@ install_app() {
     local app=$1
     [[ -d "$products/$app" ]] || return 0
     if [[ "$destination" == /Applications ]]; then
-        command="mkdir -p /Applications && rm -rf '/Applications/$app' && ditto '$products/$app' '/Applications/$app'"
-        /usr/bin/osascript -e "do shell script \"$command\" with administrator privileges"
+        /usr/bin/osascript - "$products/$app" "/Applications/$app" <<'APPLESCRIPT'
+on run argv
+    set sourcePath to quoted form of (item 1 of argv)
+    set installedPath to quoted form of (item 2 of argv)
+    do shell script "mkdir -p /Applications && rm -rf " & installedPath & " && /usr/bin/ditto " & sourcePath & " " & installedPath with administrator privileges
+end run
+APPLESCRIPT
     else
         mkdir -p "$destination"; rm -rf "$destination/$app"; /usr/bin/ditto "$products/$app" "$destination/$app"
     fi

Launcher/macos/test-publish-app.command

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Exercise a real dyld dependency chain before and after app packaging.
+set -euo pipefail
+
+[[ $(uname -s) == Darwin ]] || { printf 'This test requires macOS.\n' >&2; exit 1; }
+script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+temp_root=$(cd "${TMPDIR:-/tmp}" && pwd)
+test_root=$(mktemp -d "$temp_root/wiicompiled-publish-test.XXXXXX")
+[[ "$test_root" == "$temp_root"/wiicompiled-publish-test.* ]] || exit 1
+trap 'rm -rf "$test_root"' EXIT
+
+build_dir="$test_root/build with spaces"
+output_dir="$test_root/output with spaces"
+mkdir -p "$build_dir/A/b" "$build_dir/A/c" "$build_dir/wii_bootstrap" "$output_dir"
+cat > "$test_root/c.c" <<'EOF'
+int value_c(void) { return 7; }
+EOF
+cat > "$test_root/b.c" <<'EOF'
+extern int value_c(void);
+int value_b(void) { return 2 * value_c(); }
+EOF
+cat > "$test_root/a.c" <<'EOF'
+extern int value_b(void);
+int value_a(void) { return 1 + value_b(); }
+EOF
+cat > "$test_root/main.c" <<'EOF'
+#include <stdio.h>
+extern int value_a(void);
+int main(void) { printf("%d\n", value_a()); return 0; }
+EOF
+
+clang -dynamiclib "$test_root/c.c" -o "$build_dir/A/c/libC.dylib" \
+    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libC.dylib
+clang -dynamiclib "$test_root/b.c" -o "$build_dir/A/b/libB.dylib" \
+    -L "$build_dir/A/c" -lC \
+    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libB.dylib
+clang -dynamiclib "$test_root/a.c" -o "$build_dir/A/libA.dylib" \
+    -L "$build_dir/A/b" -lB \
+    -Wl,-headerpad_max_install_names -Wl,-install_name,@rpath/libA.dylib \
+    -Wl,-rpath,@loader_path/b -Wl,-rpath,@loader_path/c
+clang "$test_root/main.c" -o "$build_dir/WiiCompiled" \
+    -L "$build_dir/A" -lA \
+    -Wl,-headerpad_max_install_names -Wl,-rpath,@executable_path/A
+
+# B has no rpaths: its C dependency must inherit A's loader-relative path.
+[[ $("$build_dir/WiiCompiled") == 15 ]]
+for asset in dsp_coef.bin initial_pipeline_cache.db cacert.pem; do
+    : > "$build_dir/$asset"
+done
+bash "$script_dir/publish-app.command" --build-dir "$build_dir" \
+    --product WiiCompiled --output-dir "$output_dir" --architecture "$(uname -m)"
+for name in libA.dylib libB.dylib libC.dylib; do
+    [[ -f "$output_dir/WiiCompiled.app/Contents/Frameworks/$name" ]]
+done
+
+# Remove access to the original paths and relocate the app before executing.
+mv "$build_dir" "$test_root/hidden build"
+mkdir "$test_root/relocated app"
+mv "$output_dir/WiiCompiled.app" "$test_root/relocated app/WiiCompiled.app"
+[[ $("$test_root/relocated app/WiiCompiled.app/Contents/MacOS/WiiCompiled") == 15 ]]
+printf 'publish-app dependency-chain test passed\n'

Launcher/prepare-portable-tools.sh

@@ -225,7 +225,7 @@ EOF
 # clang++ invocation above would not catch a broken CMAKE_ROOT (Modules/Templates) or a Ninja that
 # can't find the compiler.
 cat > "$test_dir/CMakeLists.txt" <<'EOF'
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.25)
 project(test CXX)
 add_executable(test t.cpp)
 EOF

README.md

@@ -11,6 +11,7 @@
   <a href="#building-from-source"><img alt="PowerPC static recompilation" src="https://img.shields.io/badge/PowerPC-static%20recompilation-FF9F0A"></a>
   <a href="#retro-rewind"><img alt="Retro Rewind supported" src="https://img.shields.io/badge/Retro%20Rewind-supported-FF375F"></a>
   <a href="https://github.com/TeamWheelWizard/WheelWizard/releases"><img alt="Install with Wheel Wizard" src="https://img.shields.io/badge/install%20with-Wheel%20Wizard-8B5CF6"></a>
+  <a href="https://github.com/patchzyy/Wiicompiled/releases"><img alt="Total downloads" src="https://img.shields.io/github/downloads/patchzyy/Wiicompiled/total?color=00B8D9&amp;logo=github"></a>
   <a href="LICENSE"><img alt="License: GPLv3" src="https://img.shields.io/badge/license-GPLv3-2EA44F?logo=gnu&amp;logoColor=white"></a>
 </p>
 
@@ -52,12 +53,16 @@ Play at several times the console's resolution.
 **Music ducking.** 
 Start playing something else, Spotify, a YouTube video, and
 the game automatically mutes its own music until the other audio stops. Optional, if you'd
-rather it didn't. All audio that shows in your display media controls on your windows pc fall under this.
+rather it didn't. Windows uses system media controls and Linux uses MPRIS players.
+On macOS 14.2 or later, this detects other apps with active audio output and excludes
+the game's own audio. Apps that keep an output stream running silently can keep
+game music muted even when nothing is audible.
 
 **An in-game settings bar.** 
 Press **F10** while the game window has focus:
 - Internal resolution
 - FPS counter
+- MetalFX spatial upscaling on supported macOS GPUs
 - Controller assignment for all four ports
 - Full per-controller button mapping, including the bumpers
 - Dolphin-syntax input expressions and GCPadNew.ini import
@@ -96,8 +101,8 @@ Known limitations of the Wii Remote path:
 - GPU: GTX 1650 / RX 6400 / Arc A310 or higher
 - CPU: Intel Core i5-8400 / AMD Ryzen 5 2600 (4c/6c, ~3.5GHz+) or higher
 - About 20 GB of free disk space during installation (Final game size ~5 GB)
-- macOS 14 (Sonoma) or later on Apple Silicon
-- On macOS, Apple Xcode Command Line Tools (Setup opens Apple's installer when they are missing)
+- macOS 12 (Monterey) or later on Apple Silicon (`arm64`) or Intel (`x86_64-v3`); pre-Haswell Intel CPUs are unsupported
+- On macOS, a Metal-capable GPU and Apple Xcode Command Line Tools (Setup opens Apple's installer when they are missing)
 - A clean, unmodified **PAL `RMCP01`** disc image of Mario Kart Wii, dumped by you. ISO, GCM,
   GCZ, CISO, WBFS, WIA and RVZ are accepted.
 
@@ -118,6 +123,21 @@ image under Settings, turn on **WiiCompiled (beta)**, and hit install from the H
 Wheel Wizard downloads the setup tool from this repo and walks you through install, updates and
 launching. The backend itself is deliberately command-line only, Wheel Wizard is a wrapper around it.
 
+### macOS
+
+Download `WiiCompiled-Setup.pkg` from this repository's Releases page and open it. The universal
+package selects the appropriate bundled tools for the host architecture, supporting both Apple Silicon (`arm64`)
+and Intel (`x86_64`) Macs. It installs **WiiCompiled Setup** in Applications; open that app, choose
+your clean PAL `RMCP01` disc image, and select either the base game or Retro Rewind. For Retro Rewind, choose the `RetroRewind6` folder
+or its parent folder.
+
+Setup verifies and extracts the image locally, then translates and compiles the native app on your
+Mac. On a first run it may ask macOS to install Xcode Command Line Tools; complete Apple's installer,
+then open Setup again. When the build completes, Setup asks for administrator approval once to install
+`WiiCompiled.app` (and, if selected, `RetroRewind.app`) in `/Applications`.
+
+Setup opens Terminal while it works, so the extraction and build progress—and any error that needs
+reporting—remain visible.
 
 > [!CAUTION]
 > Only take builds from this repository's

THIRD-PARTY-NOTICES.md

@@ -132,7 +132,7 @@ trees themselves (fetched by `Launcher/Prepare-Dependencies.ps1`) so end-user bu
 | Abseil | LTS 20240722.0 | Apache-2.0 | <https://github.com/abseil/abseil-cpp> |
 | Dear ImGui | 1.91.9b-docking | MIT | <https://github.com/ocornut/imgui> |
 | {fmt} | 11.1.4 | MIT | <https://github.com/fmtlib/fmt> |
-| xxHash | 0.8.3 | BSD-2-Clause | <https://github.com/Cyan4973/xxHash> |
+| xxHash | 0.8.4 | BSD-2-Clause | <https://github.com/Cyan4973/xxHash> |
 | zlib | 1.3.2 | zlib | <https://github.com/madler/zlib> |
 | libpng | 1.6.58 | PNG Reference Library License v2 | <https://github.com/pnggroup/libpng> |
 | FreeType | 2.14.3 | **FreeType License (FTL)** - see below | <https://freetype.org/> |

aurora-main/.clang-format

@@ -1,29 +0,0 @@
----
-BasedOnStyle: LLVM
-ColumnLimit: 120
-UseTab: Never
-TabWidth: 2
----
-Language: Cpp
-DerivePointerAlignment: false
-PointerAlignment: Left
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-IndentCaseLabels: false
-AllowShortBlocksOnASingleLine: Always
-AlignOperands: true
-AlignTrailingComments: true
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
-BreakConstructorInitializersBeforeComma: true
-AlwaysBreakAfterReturnType: None
-AlwaysBreakAfterDefinitionReturnType: None
-AllowShortFunctionsOnASingleLine: All
-Cpp11BracedListStyle: true
-NamespaceIndentation: None
-BinPackArguments: true
-BinPackParameters: true
-SortIncludes: false
-AccessModifierOffset: -2
-ConstructorInitializerIndentWidth: 0
-ConstructorInitializerAllOnOneLineOrOnePerLine: true

aurora-main/.gitignore

@@ -1,10 +0,0 @@
-.buildcache/
-.DS_Store
-.idea/
-.cache/
-.vscode/
-.vs/
-build/
-cmake-build-*/
-CMakeUserPresets.json
-out/

aurora-main/CMakeLists.txt

@@ -1,85 +0,0 @@
-cmake_minimum_required(VERSION 3.25)
-project(aurora LANGUAGES C CXX)
-if (APPLE)
-    enable_language(OBJC)
-endif()
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-option(AURORA_ENABLE_GX "Enable GX implementation and WebGPU renderer" ON)
-option(AURORA_ENABLE_DVD "Enable DVD implementation backed by nod" OFF)  # TODO: need to fix tests
-option(AURORA_ENABLE_CARD "Enable CARD implementation based on kabufuda" ON)
-option(AURORA_CACHE_USE_ZSTD "Compress WebGPU cache entries with zstd" ON)
-
-# Dependency versions
-set(AURORA_DAWN_VERSION "v20260603.191052" CACHE STRING "Dawn version tag (https://github.com/encounter/dawn-build/releases)")
-set(AURORA_SDL3_VERSION "3.4.4" CACHE STRING "SDL3 version tag (https://github.com/libsdl-org/SDL/releases)")
-set(AURORA_NOD_VERSION "v2.0.0-alpha.8" CACHE STRING "nod version tag (https://github.com/encounter/nod/releases)")
-set(AURORA_LIBUSB_VERSION "1.0.30" CACHE STRING "libusb version tag (https://github.com/libusb/libusb/releases)")
-
-# Platform-specific defaults
-if (CMAKE_CROSSCOMPILING)
-  # Cross-compiling: vendor everything, don't use system packages
-  set(_default_provider "vendor")
-  set(_default_linkage "static")
-else ()
-  set(_default_provider "auto")
-  if (WIN32)
-    set(_default_linkage "shared")
-  else ()
-    set(_default_linkage "static")
-  endif ()
-endif ()
-
-# Dawn/WebGPU (if AURORA_ENABLE_GX)
-set(AURORA_DAWN_PROVIDER "${_default_provider}" CACHE STRING
-  "How to provide Dawn: auto, vendor (build from source), system (find_package/imported), package (download prebuilt)")
-set_property(CACHE AURORA_DAWN_PROVIDER PROPERTY STRINGS auto vendor system package)
-set(AURORA_DAWN_LINKAGE "${_default_linkage}" CACHE STRING "Dawn linkage type preference")
-set_property(CACHE AURORA_DAWN_LINKAGE PROPERTY STRINGS shared static)
-
-# SDL3
-set(AURORA_SDL3_PROVIDER "${_default_provider}" CACHE STRING
-  "How to provide SDL3: auto, vendor (build from source), system (find_package/imported), or package (download prebuilt)")
-set_property(CACHE AURORA_SDL3_PROVIDER PROPERTY STRINGS auto vendor system package)
-set(AURORA_SDL3_LINKAGE "${_default_linkage}" CACHE STRING "SDL3 linkage type preference")
-set_property(CACHE AURORA_SDL3_LINKAGE PROPERTY STRINGS shared static)
-option(AURORA_SDL3_LIBUSB "Build the vendored SDL3 with libusb on Windows (official GameCube adapter support)" ON)
-
-# nod (if AURORA_ENABLE_DVD)
-set(AURORA_NOD_PROVIDER "${_default_provider}" CACHE STRING
-  "How to provide nod: auto, vendor (build from source), system (find_package/imported), package (download prebuilt)")
-set_property(CACHE AURORA_NOD_PROVIDER PROPERTY STRINGS auto vendor system package)
-set(AURORA_NOD_LINKAGE "${_default_linkage}" CACHE STRING "nod linkage type preference")
-set_property(CACHE AURORA_NOD_LINKAGE PROPERTY STRINGS shared static)
-
-add_subdirectory(extern)
-
-include(cmake/aurora_core.cmake)
-include(cmake/aurora_os.cmake)
-if (AURORA_ENABLE_GX)
-  include(cmake/aurora_gx.cmake)
-  include(cmake/aurora_gd.cmake)
-endif ()
-include(cmake/aurora_pad.cmake)
-include(cmake/aurora_ms.cmake)
-include(cmake/aurora_si.cmake)
-include(cmake/aurora_main.cmake)
-include(cmake/aurora_mtx.cmake)
-include(cmake/aurora_vi.cmake)
-if(AURORA_ENABLE_CARD)
-  include(cmake/aurora_card.cmake)
-endif()
-if (AURORA_ENABLE_DVD)
-  include(cmake/aurora_dvd.cmake)
-endif ()
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-  add_subdirectory(examples)
-endif ()
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_CROSSCOMPILING)
-  enable_testing()
-  add_subdirectory(tests)
-endif ()

aurora-main/LICENSE

@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2022 Luke Street
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

aurora-main/README.md

@@ -1,46 +0,0 @@
-<div align="center">
-  <img src="assets/aurora.png" alt="Logo" width="640">
-</div>
-<br/>
-
-Aurora is a source-level GameCube & Wii compatibility layer intended for use with game decompilation projects.
-
-Originally developed for use in [Metaforce](https://github.com/AxioDL/metaforce), a Metroid Prime reverse engineering project.
-It now powers several completed source ports, including [Dusklight](https://github.com/TwilitRealm/dusklight).
-
-### Features
-
-- Application layer using SDL3
-  - Runs on Windows, Linux, macOS, iOS, tvOS, Android
-- GX compatibility layer
-  - Graphics API support: D3D12, Vulkan, Metal
-  - Highly accurate and performant GX implementation
-  - Robust pipeline cache system with "transferable" cache support for releases
-  - Dolphin-compatible texture pack support
-  - Widescreen & resolution scaling support
-  - Custom APIs for offscreen rendering
-- PAD compatibility layer
-  - Utilizes `SDL_Gamepad` for wide controller support, including GameCube controller adapters
-  - Automatically saves and loads controller bindings and port mappings
-  - Gyro & mouse support
-- DVD compatibility layer
-  - Utilizes [nod](https://github.com/encounter/nod) to support all GameCube/Wii disc image types, including RVZ
-- CARD compatibility layer
-  - Full compatibility with Dolphin `.gci` and `.raw` for game saves
-- [Dear ImGui](https://github.com/ocornut/imgui) built-in for simple debug UIs
-
-### Graphics
-
-The GX compatibility layer is built on top of [WebGPU](https://www.w3.org/TR/webgpu/), a cross-platform graphics API
-abstraction layer. WebGPU allows targeting all major platforms simultaneously with minimal overhead. The WebGPU
-implementation used is Chromium's [Dawn](https://dawn.googlesource.com/dawn/).
-
-![Screenshot](assets/screenshot.png)
-
-### Building
-
-See [docs/building.md](docs/building.md) for build instructions, CMake integration, and configuration options.
-
-### License
-
-Aurora is licensed under the [MIT License](LICENSE).

aurora-main/cmake/AuroraCopyRuntimeDLLs.cmake

@@ -1,55 +0,0 @@
-include_guard(GLOBAL)
-
-# aurora_copy_runtime_dlls(<executable_target> [<additional_targets>...])
-#
-# POST_BUILD command that copies all TARGET_RUNTIME_DLLS from the given targets
-# next to the executable, plus any extra DLLs that Dawn loads dynamically
-# (dxcompiler.dll, dxil.dll).
-function(aurora_copy_runtime_dlls target)
-  if (NOT WIN32)
-    return()
-  endif ()
-
-  # Copy TARGET_RUNTIME_DLLS for each target
-  foreach (_t IN ITEMS ${target} ${ARGN})
-    add_custom_command(TARGET ${target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${_t}> $<TARGET_FILE_DIR:${target}>
-        COMMAND_EXPAND_LISTS
-    )
-  endforeach ()
-
-  # Copy DXC DLLs that Dawn loads via LoadLibrary at runtime
-  if (TARGET dawn::webgpu_dawn)
-    get_target_property(_dawn_loc dawn::webgpu_dawn IMPORTED_LOCATION)
-    if (NOT _dawn_loc)
-      get_target_property(_dawn_loc dawn::webgpu_dawn IMPORTED_LOCATION_RELEASE)
-    endif ()
-    if (_dawn_loc)
-      cmake_path(GET _dawn_loc PARENT_PATH _dawn_bin_dir)
-      foreach (_dll IN ITEMS dxcompiler.dll dxil.dll)
-        if (EXISTS "${_dawn_bin_dir}/${_dll}")
-          add_custom_command(TARGET ${target} POST_BUILD
-              COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dawn_bin_dir}/${_dll}" $<TARGET_FILE_DIR:${target}>
-          )
-        endif ()
-      endforeach ()
-    endif ()
-  endif ()
-endfunction()
-
-# aurora_install_runtime_dlls(<executable_target> <install_destination>)
-#
-# INSTALL rule that copies all DLLs already placed next to the built target
-# into the install destination.
-function(aurora_install_runtime_dlls target install_destination)
-  if (NOT WIN32)
-    return()
-  endif ()
-
-  install(CODE
-    "file(GLOB _aurora_runtime_dlls \"$<TARGET_FILE_DIR:${target}>/*.dll\")\n\
-if(_aurora_runtime_dlls)\n\
-  file(INSTALL DESTINATION \"${install_destination}\" TYPE FILE FILES \${_aurora_runtime_dlls})\n\
-endif()"
-  )
-endfunction()

aurora-main/cmake/AuroraDawnProvider.cmake

@@ -1,276 +0,0 @@
-include_guard(GLOBAL)
-
-# Resolve Dawn/WebGPU dependency based on AURORA_DAWN_PROVIDER and AURORA_DAWN_LINKAGE.
-#
-# After this module runs:
-#   - dawn::webgpu_dawn target is available
-#   - dawn::dawncpp_headers target is available (for tests)
-#   - DAWN_ENABLE_* backend variables are set for the target platform
-#   - AURORA_DAWN_IS_SHARED is set to TRUE/FALSE
-
-# When using a non-vendored Dawn, we don't get DAWN_ENABLE_* from its build.
-# Infer from the target platform instead.
-function(_aurora_dawn_set_platform_backends)
-  if (WIN32)
-    set(DAWN_ENABLE_D3D12 ON CACHE INTERNAL "")
-    # Disable D3D11 because this Aurora fork does not support it.
-    set(DAWN_ENABLE_D3D11 OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_VULKAN ON CACHE INTERNAL "")
-    set(DAWN_ENABLE_METAL OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_DESKTOP_GL OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_OPENGLES OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_NULL ON CACHE INTERNAL "")
-  elseif (APPLE)
-    set(DAWN_ENABLE_D3D12 OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_D3D11 OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_VULKAN OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_METAL ON CACHE INTERNAL "")
-    set(DAWN_ENABLE_DESKTOP_GL OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_OPENGLES OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_NULL ON CACHE INTERNAL "")
-  else () # Linux / other
-    set(DAWN_ENABLE_D3D12 OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_D3D11 OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_VULKAN ON CACHE INTERNAL "")
-    set(DAWN_ENABLE_METAL OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_DESKTOP_GL OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_OPENGLES OFF CACHE INTERNAL "")
-    set(DAWN_ENABLE_NULL ON CACHE INTERNAL "")
-  endif ()
-endfunction()
-
-# ── Auto: resolve provider based on platform availability ──
-set(_aurora_dawn_provider "${AURORA_DAWN_PROVIDER}")
-if (_aurora_dawn_provider STREQUAL "auto")
-  # Prebuilt Dawn packages available for: windows-{amd64,arm64}, linux-{x86_64,aarch64}, darwin-{arm64,x86_64}
-  set(_has_package FALSE)
-  if (WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64|x86_64|ARM64|aarch64)$")
-    set(_has_package TRUE)
-  elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$")
-    set(_has_package TRUE)
-  elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
-    set(_has_package TRUE)
-  endif ()
-
-  if (_has_package)
-    set(_aurora_dawn_provider "package")
-  else ()
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    find_package(Dawn QUIET)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-    if (Dawn_FOUND)
-      set(_aurora_dawn_provider "system")
-    else ()
-      set(_aurora_dawn_provider "vendor")
-    endif ()
-  endif ()
-  set(AURORA_DAWN_PROVIDER "${_aurora_dawn_provider}" CACHE STRING "" FORCE)
-  message(STATUS "aurora: Dawn auto-resolved provider: ${_aurora_dawn_provider}")
-endif ()
-
-if (_aurora_dawn_provider STREQUAL "vendor")
-  # ── Vendor: FetchContent build from source ──
-  if (NOT TARGET webgpu_dawn)
-    message(STATUS "aurora: Fetching Dawn (provider=vendor, linkage=${AURORA_DAWN_LINKAGE})")
-
-    if (AURORA_DAWN_LINKAGE STREQUAL "shared")
-      set(DAWN_BUILD_MONOLITHIC_LIBRARY SHARED CACHE INTERNAL
-        "Bundle all dawn components into a single shared library.")
-    else ()
-      set(DAWN_BUILD_MONOLITHIC_LIBRARY STATIC CACHE INTERNAL
-        "Bundle all dawn components into a single static library.")
-    endif ()
-    set(DAWN_BUILD_SAMPLES OFF CACHE INTERNAL "Disable Dawn sample applications")
-    set(DAWN_BUILD_BENCHMARKS OFF CACHE INTERNAL "Disable Dawn benchmarks")
-    set(DAWN_SUPPORTS_GLFW_FOR_WINDOWING OFF CACHE INTERNAL "Disable Dawn GLFW windowing")
-    set(DAWN_ENABLE_DESKTOP_GL OFF CACHE INTERNAL "Enable compilation of the OpenGL backend")
-    set(DAWN_ENABLE_OPENGLES OFF CACHE INTERNAL "Enable compilation of the OpenGL ES backend")
-    set(DAWN_FETCH_DEPENDENCIES ON CACHE INTERNAL
-      "Use fetch_dawn_dependencies.py as an alternative to using depot_tools")
-    if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-      set(DAWN_USE_WAYLAND ON CACHE INTERNAL "Enable support for Wayland surface")
-    endif ()
-    set(TINT_BUILD_TESTS OFF CACHE INTERNAL "Build tests")
-    set(TINT_BUILD_CMD_TOOLS OFF CACHE INTERNAL "Build the Tint command line tools")
-    if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY OR CMAKE_MSVC_RUNTIME_LIBRARY MATCHES "DLL$")
-      set(ABSL_MSVC_STATIC_RUNTIME OFF CACHE INTERNAL "Link static runtime libraries")
-    else ()
-      set(ABSL_MSVC_STATIC_RUNTIME ON CACHE INTERNAL "Link static runtime libraries")
-    endif ()
-
-    include(FetchContent)
-    FetchContent_Declare(dawn
-      URL "https://github.com/google/dawn/archive/refs/tags/${AURORA_DAWN_VERSION}.tar.gz"
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(dawn)
-    if (NOT TARGET webgpu_dawn)
-      message(FATAL_ERROR "Failed to make dawn available")
-    endif ()
-  else ()
-    message(STATUS "aurora: Using existing Dawn")
-  endif ()
-
-  if (AURORA_DAWN_LINKAGE STREQUAL "shared")
-    set(AURORA_DAWN_IS_SHARED TRUE PARENT_SCOPE)
-  else ()
-    set(AURORA_DAWN_IS_SHARED FALSE PARENT_SCOPE)
-  endif ()
-
-elseif (_aurora_dawn_provider STREQUAL "system")
-  # ── System: find_package(Dawn) ──
-  message(STATUS "aurora: Using system Dawn (provider=system)")
-  if (NOT Dawn_FOUND)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    find_package(Dawn REQUIRED)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-  endif ()
-  if (NOT TARGET dawn::webgpu_dawn)
-    message(FATAL_ERROR "find_package(Dawn) succeeded but dawn::webgpu_dawn target not found")
-  endif ()
-  _aurora_dawn_set_platform_backends()
-
-  get_target_property(_dawn_type dawn::webgpu_dawn TYPE)
-  if (_dawn_type STREQUAL "SHARED_LIBRARY")
-    set(AURORA_DAWN_IS_SHARED TRUE PARENT_SCOPE)
-  else ()
-    set(AURORA_DAWN_IS_SHARED FALSE PARENT_SCOPE)
-  endif ()
-
-elseif (_aurora_dawn_provider STREQUAL "package")
-  # ── Package: download prebuilt Dawn install tree ──
-  if (NOT AURORA_DAWN_PACKAGE_URL)
-    string(TOLOWER "${CMAKE_SYSTEM_NAME}" _dawn_system)
-    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _dawn_arch)
-    if (_dawn_system STREQUAL "windows")
-      if (_dawn_arch STREQUAL "x86_64")
-        set(_dawn_arch "amd64")
-      elseif (_dawn_arch STREQUAL "aarch64")
-        set(_dawn_arch "arm64")
-      endif ()
-    endif ()
-    set(AURORA_DAWN_PACKAGE_URL
-      "https://github.com/theofficialgman/dawn-build/releases/download/${AURORA_DAWN_VERSION}/dawn-${_dawn_system}-${_dawn_arch}.tar.gz")
-
-    # A release asset is mutable: the same tag has already served two different windows-amd64 archives,
-    # and a cached extraction is never re-verified. Pin the digest for the combinations we ship.
-    if (NOT AURORA_DAWN_PACKAGE_URL_HASH AND AURORA_DAWN_VERSION STREQUAL "v20260603.191052")
-      if (_dawn_system STREQUAL "windows" AND _dawn_arch STREQUAL "amd64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=13be9cff8b9b179c42dcd16aeabb6effcc8f0dfdcc14463eda2a5caeda225142")
-      elseif (_dawn_system STREQUAL "windows" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=bf2d921110f14a1d6553f673c5597988e66c02af5587e4a1fee167937d247734")
-      elseif (_dawn_system STREQUAL "linux" AND _dawn_arch STREQUAL "x86_64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=7adcf241bb2a24ec0c576609f2d67203e0e65db9c5a286ca2bbb6281fa644b35")
-      elseif (_dawn_system STREQUAL "linux" AND _dawn_arch STREQUAL "aarch64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=2415e253d46f91b2d72fc73bf6055fb31b98b67c773dc546e1991b1cf019732f")
-      elseif (_dawn_system STREQUAL "darwin" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=0a8ea8eb0159fc0ba1083c52155d9376fb173cffe690b400464a6ad8881bb461")
-      elseif (_dawn_system STREQUAL "darwin" AND _dawn_arch STREQUAL "x86_64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=5fe2c7a2a8b4cb82acee4af16779a83ae333c7657b9dc1a5008f5fd1f5ad5f80")
-      elseif (_dawn_system STREQUAL "ios" AND _dawn_arch STREQUAL "arm64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=f97701d26fd1f25bbcc260b4c31736ede134c730c12556029e2470fde967f424")
-      elseif (_dawn_system STREQUAL "android" AND _dawn_arch STREQUAL "aarch64")
-        set(AURORA_DAWN_PACKAGE_URL_HASH
-          "SHA256=0e63e8cbf53551f703f582d1306f4257c0380353f66b53369d96952ce6d9f934")
-      endif ()
-    endif ()
-  endif ()
-  message(STATUS "aurora: Fetching prebuilt Dawn package from ${AURORA_DAWN_PACKAGE_URL}")
-
-  set(_dawn_prebuilt_hash_argument "")
-  if (AURORA_DAWN_PACKAGE_URL_HASH)
-    set(_dawn_prebuilt_hash_argument URL_HASH "${AURORA_DAWN_PACKAGE_URL_HASH}")
-  endif ()
-
-  include(FetchContent)
-  FetchContent_Declare(dawn_prebuilt
-    URL "${AURORA_DAWN_PACKAGE_URL}"
-    ${_dawn_prebuilt_hash_argument}
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-  )
-  FetchContent_MakeAvailable(dawn_prebuilt)
-
-  # Detect package layout: may be nested in a subdirectory
-  set(_dawn_pkg_dir "${dawn_prebuilt_SOURCE_DIR}")
-  file(GLOB _dawn_subdirs
-    "${dawn_prebuilt_SOURCE_DIR}/dawn-*"
-    "${dawn_prebuilt_SOURCE_DIR}/Dawn-*"
-  )
-  foreach (_sd IN LISTS _dawn_subdirs)
-    if (IS_DIRECTORY "${_sd}")
-      set(_dawn_pkg_dir "${_sd}")
-      break()
-    endif ()
-  endforeach ()
-  if (IS_DIRECTORY "${dawn_prebuilt_SOURCE_DIR}/dawn-install")
-    set(_dawn_pkg_dir "${dawn_prebuilt_SOURCE_DIR}/dawn-install")
-  endif ()
-
-  # Static Dawn packages may link Threads::Threads
-  find_package(Threads QUIET)
-
-  # Find DawnConfig.cmake in the package
-  set(_dawn_cmake_found FALSE)
-  foreach (_cmake_path
-    "${_dawn_pkg_dir}/lib/cmake/Dawn"
-    "${_dawn_pkg_dir}/lib64/cmake/Dawn"
-    "${_dawn_pkg_dir}/cmake/Dawn"
-    "${_dawn_pkg_dir}/cmake"
-  )
-    if (EXISTS "${_cmake_path}/DawnConfig.cmake")
-      set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-      find_package(Dawn REQUIRED CONFIG PATHS "${_cmake_path}" NO_DEFAULT_PATH)
-      set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-      set(_dawn_cmake_found TRUE)
-      break()
-    endif ()
-  endforeach ()
-
-  if (NOT _dawn_cmake_found OR NOT TARGET dawn::webgpu_dawn)
-    message(FATAL_ERROR
-      "Dawn package does not contain DawnConfig.cmake.\n"
-      "Searched: ${_dawn_pkg_dir}/{lib,lib64,cmake}/cmake/Dawn/\n"
-      "The package must be a Dawn install tree built with DAWN_ENABLE_INSTALL=ON.")
-  endif ()
-
-  _aurora_dawn_set_platform_backends()
-
-  get_target_property(_dawn_pkg_type dawn::webgpu_dawn TYPE)
-  if (_dawn_pkg_type STREQUAL "SHARED_LIBRARY")
-    set(AURORA_DAWN_IS_SHARED TRUE PARENT_SCOPE)
-
-  else ()
-    set(AURORA_DAWN_IS_SHARED FALSE PARENT_SCOPE)
-  endif ()
-
-else ()
-  message(FATAL_ERROR "Invalid AURORA_DAWN_PROVIDER: ${AURORA_DAWN_PROVIDER} "
-    "(must be auto, vendor, system, or package)")
-endif ()
-
-# Ensure dawn::dawncpp_headers target exists (needed by tests).
-# When Dawn is vendored, this target is created by Dawn's CMake.
-# For package/system providers, create it from the same include dirs.
-if (NOT TARGET dawn::dawncpp_headers)
-  add_library(dawn_dawncpp_headers INTERFACE IMPORTED GLOBAL)
-  get_target_property(_dawn_inc dawn::webgpu_dawn INTERFACE_INCLUDE_DIRECTORIES)
-  if (NOT _dawn_inc)
-    if (TARGET dawn::dawn_public_config)
-      get_target_property(_dawn_inc dawn::dawn_public_config INTERFACE_INCLUDE_DIRECTORIES)
-    endif ()
-  endif ()
-  if (_dawn_inc)
-    target_include_directories(dawn_dawncpp_headers INTERFACE ${_dawn_inc})
-  else ()
-    target_link_libraries(dawn_dawncpp_headers INTERFACE dawn::webgpu_dawn)
-  endif ()
-  add_library(dawn::dawncpp_headers ALIAS dawn_dawncpp_headers)
-endif ()

aurora-main/cmake/AuroraLibUSB.cmake

@@ -1,43 +0,0 @@
-# libusb for SDL3's HIDAPI joystick drivers on Windows.
-#
-# The official GameCube adapter (WUP-028) is a vendor-specific USB device, not HID, so SDL3
-# can only reach it through libusb - which the official SDL3 packages leave out. The vendored
-# SDL3 build compiles libusb from the pinned upstream release and links it in statically.
-
-include(FetchContent)
-FetchContent_Declare(libusb
-  URL "https://github.com/libusb/libusb/releases/download/v${AURORA_LIBUSB_VERSION}/libusb-${AURORA_LIBUSB_VERSION}.tar.bz2"
-  DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-)
-# Upstream ships no CMakeLists.txt, so this only populates the source tree.
-FetchContent_MakeAvailable(libusb)
-
-set(_libusb_root "${libusb_SOURCE_DIR}/libusb")
-add_library(usb-1.0 STATIC
-  "${_libusb_root}/core.c"
-  "${_libusb_root}/descriptor.c"
-  "${_libusb_root}/hotplug.c"
-  "${_libusb_root}/io.c"
-  "${_libusb_root}/strerror.c"
-  "${_libusb_root}/sync.c"
-  "${_libusb_root}/os/events_windows.c"
-  "${_libusb_root}/os/threads_windows.c"
-  "${_libusb_root}/os/windows_common.c"
-  "${_libusb_root}/os/windows_usbdk.c"
-  "${_libusb_root}/os/windows_winusb.c"
-)
-target_include_directories(usb-1.0
-  PUBLIC "${_libusb_root}"
-  PRIVATE "${CMAKE_CURRENT_LIST_DIR}/libusb" "${_libusb_root}/os"
-)
-set_target_properties(usb-1.0 PROPERTIES UNITY_BUILD OFF)
-add_library(LibUSB::LibUSB ALIAS usb-1.0)
-
-# SDL's FindLibUSB expects an installed copy. Satisfy its presence checks with this target
-# instead: the alias pre-empts the imported target it would otherwise create, and the link
-# probe is answered up front because the archive does not exist until build time.
-set(LibUSB_INCLUDE_PATH "${_libusb_root}" CACHE PATH "" FORCE)
-set(LibUSB_LIBRARY "usb-1.0" CACHE STRING "" FORCE)
-set(HAVE_LIBUSB_H 1 CACHE INTERNAL "" FORCE)
-set(SDL_HIDAPI_LIBUSB ON CACHE BOOL "" FORCE)
-set(SDL_HIDAPI_LIBUSB_SHARED OFF CACHE BOOL "" FORCE)

aurora-main/cmake/AuroraNodProvider.cmake

@@ -1,150 +0,0 @@
-include_guard(GLOBAL)
-
-# Resolve nod dependency based on AURORA_NOD_PROVIDER.
-#
-# After this module runs:
-#   - nod::nod target is available
-#
-# AURORA_NOD_LINKAGE controls shared vs static linkage:
-#   - "shared" (default): prefer nod::nod_shared
-#   - "static": prefer nod::nod_static
-
-# ── Auto: resolve provider based on platform availability ──
-set(_aurora_nod_provider "${AURORA_NOD_PROVIDER}")
-if (_aurora_nod_provider STREQUAL "auto")
-  # Prebuilt nod packages available for: windows-x86_64, linux-x86_64, macos-arm64
-  set(_has_package FALSE)
-  if (WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64)$")
-    set(_has_package TRUE)
-  elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64)$")
-    set(_has_package TRUE)
-  elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64)$")
-    set(_has_package TRUE)
-  endif ()
-
-  if (_has_package)
-    set(_aurora_nod_provider "package")
-  else ()
-    find_package(nod QUIET CONFIG)
-    if (nod_FOUND)
-      set(_aurora_nod_provider "system")
-    else ()
-      set(_aurora_nod_provider "vendor")
-    endif ()
-  endif ()
-  set(AURORA_NOD_PROVIDER "${_aurora_nod_provider}" CACHE STRING "" FORCE)
-  message(STATUS "aurora: nod auto-resolved provider: ${_aurora_nod_provider}")
-endif ()
-
-if (_aurora_nod_provider STREQUAL "vendor")
-  # ── Vendor: FetchContent + Corrosion build from source ──
-  if (NOT TARGET nod::nod)
-    message(STATUS "aurora: Building nod (provider=vendor, linkage=${AURORA_NOD_LINKAGE})")
-
-    # Corrosion may default to the host Rust target triple (commonly x86_64 on
-    # Windows). Force Rust to i686 for true Win32 builds so nod and its vendored
-    # compression libraries are built for the same architecture as the C/C++ build.
-    if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-      set(Rust_CARGO_TARGET "i686-pc-windows-msvc" CACHE STRING "Rust target triple" FORCE)
-      set(Rust_RUSTUP_INSTALL_MISSING_TARGET ON CACHE BOOL "Allow Corrosion to install missing Rust targets" FORCE)
-      message(STATUS "aurora: forcing Rust_CARGO_TARGET=${Rust_CARGO_TARGET} for Win32 nod build")
-    endif ()
-
-    # Control whether nod builds shared, static, or both.
-    # Save/restore BUILD_SHARED_LIBS to avoid leaking into other subdirectories.
-    set(_aurora_nod_saved_bsl "${BUILD_SHARED_LIBS}")
-    if (AURORA_NOD_LINKAGE STREQUAL "static")
-      set(BUILD_SHARED_LIBS OFF)
-    else ()
-      set(BUILD_SHARED_LIBS ON)
-    endif ()
-
-    include(FetchContent)
-    FetchContent_Declare(aurora_nod
-      GIT_REPOSITORY "https://github.com/encounter/nod.git"
-      GIT_TAG "${AURORA_NOD_VERSION}"
-      GIT_SHALLOW TRUE
-      EXCLUDE_FROM_ALL
-    )
-
-    FetchContent_MakeAvailable(aurora_nod)
-    set(BUILD_SHARED_LIBS "${_aurora_nod_saved_bsl}")
-    unset(_aurora_nod_saved_bsl)
-    if (NOT TARGET nod::nod)
-      message(FATAL_ERROR "Failed to make nod available")
-    endif ()
-  else ()
-    message(STATUS "aurora: Using existing nod")
-  endif ()
-
-elseif (_aurora_nod_provider STREQUAL "system")
-  # ── System: find preinstalled nod ──
-  message(STATUS "aurora: Using system nod (provider=system, linkage=${AURORA_NOD_LINKAGE})")
-
-  if (NOT nod_FOUND)
-    set(_aurora_nod_saved_bsl "${BUILD_SHARED_LIBS}")
-    if (AURORA_NOD_LINKAGE STREQUAL "static")
-      set(BUILD_SHARED_LIBS OFF)
-    else ()
-      set(BUILD_SHARED_LIBS ON)
-    endif ()
-
-    find_package(nod REQUIRED CONFIG)
-    set(BUILD_SHARED_LIBS "${_aurora_nod_saved_bsl}")
-    unset(_aurora_nod_saved_bsl)
-  endif ()
-  if (NOT TARGET nod::nod)
-    message(FATAL_ERROR "find_package(nod) succeeded but nod::nod target not found")
-  endif ()
-  message(STATUS "aurora: Found nod via find_package(nod)")
-
-elseif (_aurora_nod_provider STREQUAL "package")
-  # ── Package: download prebuilt nod library ──
-  if (NOT AURORA_NOD_PACKAGE_URL)
-    if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set(_nod_platform "windows-x86_64")
-    elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64)$")
-      set(_nod_platform "linux-x86_64")
-    elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)$")
-      set(_nod_platform "macos-arm64")
-    else ()
-      message(FATAL_ERROR
-        "AURORA_NOD_PROVIDER=package requires AURORA_NOD_PACKAGE_URL on this platform.\n"
-        "Prebuilt packages: https://github.com/encounter/nod/releases")
-    endif ()
-    set(AURORA_NOD_PACKAGE_URL
-      "https://github.com/encounter/nod/releases/download/${AURORA_NOD_VERSION}/libnod-${_nod_platform}.tar.gz")
-  endif ()
-  message(STATUS "aurora: Fetching prebuilt nod package (provider=package, linkage=${AURORA_NOD_LINKAGE})")
-
-  include(FetchContent)
-  FetchContent_Declare(nod_prebuilt
-    URL "${AURORA_NOD_PACKAGE_URL}"
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    EXCLUDE_FROM_ALL
-  )
-  FetchContent_MakeAvailable(nod_prebuilt)
-
-  # The prebuilt package ships a CMake config that creates nod::nod_shared,
-  # nod::nod_static, and a default nod::nod (based on BUILD_SHARED_LIBS).
-  # Set BUILD_SHARED_LIBS so the config selects the right default target.
-  set(_aurora_nod_saved_bsl "${BUILD_SHARED_LIBS}")
-  if (AURORA_NOD_LINKAGE STREQUAL "static")
-    set(BUILD_SHARED_LIBS OFF)
-  else ()
-    set(BUILD_SHARED_LIBS ON)
-  endif ()
-  find_package(nod REQUIRED CONFIG
-    PATHS "${nod_prebuilt_SOURCE_DIR}"
-    NO_DEFAULT_PATH
-  )
-  set(BUILD_SHARED_LIBS "${_aurora_nod_saved_bsl}")
-  unset(_aurora_nod_saved_bsl)
-  if (NOT TARGET nod::nod)
-    message(FATAL_ERROR "Prebuilt nod package did not provide nod::nod target")
-  endif ()
-
-else ()
-  message(FATAL_ERROR "Invalid AURORA_NOD_PROVIDER: ${AURORA_NOD_PROVIDER} "
-    "(must be auto, vendor, system, or package)")
-endif ()

aurora-main/cmake/AuroraSDL3Patches.cmake

@@ -1,126 +0,0 @@
-# Source-level fixes applied to the vendored SDL3 tree before it is built.
-#
-# Each patch is an exact string replacement, checked and idempotent: a tree that
-# already carries the fix is left alone, a tree where the anchor text is missing
-# (a different SDL version) stops the configure with a clear message instead of
-# silently building without the fix.
-#
-# Used two ways:
-#   - included by AuroraSDL3Provider.cmake, which calls aurora_sdl3_apply_patches()
-#     on a pre-provided source tree (FETCHCONTENT_SOURCE_DIR_SDL);
-#   - run as `cmake -DSDL_SOURCE_DIR=<dir> -P AuroraSDL3Patches.cmake` from the
-#     FetchContent PATCH_COMMAND for a freshly extracted tarball.
-
-function(_aurora_sdl3_replace file description old new)
-  file(READ "${file}" _content)
-  string(FIND "${_content}" "${new}" _already)
-  if (NOT _already EQUAL -1)
-    return()
-  endif ()
-  string(FIND "${_content}" "${old}" _anchor)
-  if (_anchor EQUAL -1)
-    message(FATAL_ERROR "aurora: SDL3 patch '${description}' does not apply to ${file}; "
-      "the vendored SDL version changed, review AuroraSDL3Patches.cmake")
-  endif ()
-  string(REPLACE "${old}" "${new}" _content "${_content}")
-  file(WRITE "${file}" "${_content}")
-  message(STATUS "aurora: SDL3 patch applied: ${description}")
-endfunction()
-
-function(aurora_sdl3_apply_patches sdl_source_dir)
-  set(_wii "${sdl_source_dir}/src/joystick/hidapi/SDL_hidapi_wii.c")
-  if (NOT EXISTS "${_wii}")
-    message(FATAL_ERROR "aurora: SDL3 source tree at ${sdl_source_dir} has no SDL_hidapi_wii.c")
-  endif ()
-
-  # Wii Remote: rebuild the joystick in place after an extension change.
-  #
-  # When a Nunchuk or Classic Controller is plugged in or pulled out, the driver
-  # flags the joystick as disconnected so it can come back with the new name and
-  # capabilities. But the HID device stays open, and HIDAPI only removes a
-  # joystick-less device once its handle is closed, so nothing ever re-creates
-  # the joystick: the remote is gone for good until the application toggles the
-  # driver hint (which closes and re-opens the Bluetooth HID handle, something
-  # some Windows Bluetooth stacks answer by dropping the link). Instead, when the
-  # device has no joystick, probe the extension again (two bounded attempts, at
-  # most once a second) and connect a new joystick on the still-open handle.
-  _aurora_sdl3_replace("${_wii}" "Wii Remote in-place reconnect (context field)"
-[==[    Uint64 m_ulNextMotionPlusCheck;
-    bool m_bDisconnected;
-]==]
-[==[    Uint64 m_ulNextMotionPlusCheck;
-    bool m_bDisconnected;
-    Uint64 m_ulNextReconnect; /* WiiCompiled: see HIDAPI_DriverWii_UpdateDevice */
-]==])
-  _aurora_sdl3_replace("${_wii}" "Wii Remote in-place reconnect (bounded extension probe)"
-[==[static EWiiExtensionControllerType ReadExtensionControllerType(SDL_HIDAPI_Device *device)
-{
-    SDL_DriverWii_Context *ctx = (SDL_DriverWii_Context *)device->context;
-    EWiiExtensionControllerType eExtensionControllerType = k_eWiiExtensionControllerType_Unknown;
-    const int MAX_ATTEMPTS = 20;
-    int attempts = 0;
-]==]
-[==[static EWiiExtensionControllerType ReadExtensionControllerTypeAttempts(SDL_HIDAPI_Device *device, int MAX_ATTEMPTS)
-{
-    SDL_DriverWii_Context *ctx = (SDL_DriverWii_Context *)device->context;
-    EWiiExtensionControllerType eExtensionControllerType = k_eWiiExtensionControllerType_Unknown;
-    int attempts = 0;
-]==])
-  _aurora_sdl3_replace("${_wii}" "Wii Remote in-place reconnect (probe wrapper)"
-[==[static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
-{
-]==]
-[==[static EWiiExtensionControllerType ReadExtensionControllerType(SDL_HIDAPI_Device *device)
-{
-    return ReadExtensionControllerTypeAttempts(device, 20);
-}
-
-static void UpdateDeviceIdentity(SDL_HIDAPI_Device *device)
-{
-]==])
-  _aurora_sdl3_replace("${_wii}" "Wii Remote in-place reconnect (UpdateDevice)"
-[==[    if (device->num_joysticks > 0) {
-        joystick = SDL_GetJoystickFromID(device->joysticks[0]);
-    } else {
-        return false;
-    }
-
-    now = SDL_GetTicks();
-]==]
-[==[    if (device->num_joysticks > 0) {
-        joystick = SDL_GetJoystickFromID(device->joysticks[0]);
-    } else {
-        /* WiiCompiled: the joystick was dropped (extension plugged or unplugged,
-         * or a failed read) but the HID device is still open, and the device
-         * list only removes a joystick-less device once its handle is closed.
-         * Rebuild the joystick in place, so an extension change behaves like it
-         * does on the console: the remote never goes away, it just changes
-         * type. If the remote does not answer, keep the device and retry. */
-        now = SDL_GetTicks();
-        if (ctx->m_ulNextReconnect != 0 && now < ctx->m_ulNextReconnect) {
-            return false;
-        }
-        ctx->m_ulNextReconnect = now + 1000;
-        {
-            EWiiExtensionControllerType type = ReadExtensionControllerTypeAttempts(device, 2);
-            if (type == k_eWiiExtensionControllerType_Unknown) {
-                return false;
-            }
-            ctx->m_bDisconnected = false;
-            ctx->m_ulLastInput = now;
-            ctx->m_ulNextReconnect = 0;
-            ctx->m_eExtensionControllerType = type;
-            UpdateDeviceIdentity(device);
-            SDL_LogDebug(SDL_LOG_CATEGORY_INPUT, "HIDAPI Wii: Reconnected joystick as %s", device->name);
-            return HIDAPI_JoystickConnected(device, NULL);
-        }
-    }
-
-    now = SDL_GetTicks();
-]==])
-endfunction()
-
-# Script mode (FetchContent PATCH_COMMAND).
-if (CMAKE_SCRIPT_MODE_FILE AND DEFINED SDL_SOURCE_DIR)
-  aurora_sdl3_apply_patches("${SDL_SOURCE_DIR}")
-endif ()

aurora-main/cmake/AuroraSDL3Provider.cmake

@@ -1,161 +0,0 @@
-include_guard(GLOBAL)
-
-# Resolve SDL3 dependency based on AURORA_SDL3_PROVIDER and AURORA_SDL3_LINKAGE.
-#
-# After this module runs, the variable AURORA_SDL3_TARGET is set to the
-# appropriate target name for use in target_link_libraries() calls.
-
-# Select the SDL3 target matching the requested linkage.
-function(_aurora_sdl3_select_target)
-  if (AURORA_SDL3_LINKAGE STREQUAL "static")
-    if (TARGET SDL3::SDL3-static)
-      set(AURORA_SDL3_TARGET SDL3::SDL3-static CACHE INTERNAL "")
-      message(STATUS "aurora: Using static SDL3")
-      return()
-    elseif (TARGET SDL3::SDL3)
-      message(WARNING "aurora: Static SDL3 requested but only shared is available")
-      set(AURORA_SDL3_TARGET SDL3::SDL3 CACHE INTERNAL "")
-      message(STATUS "aurora: Using shared SDL3")
-      return()
-    endif ()
-  else ()
-    if (TARGET SDL3::SDL3)
-      set(AURORA_SDL3_TARGET SDL3::SDL3 CACHE INTERNAL "")
-      message(STATUS "aurora: Using shared SDL3")
-      return()
-    elseif (TARGET SDL3::SDL3-static)
-      message(WARNING "aurora: Shared SDL3 requested but only static is available")
-      set(AURORA_SDL3_TARGET SDL3::SDL3-static CACHE INTERNAL "")
-      message(STATUS "aurora: Using static SDL3")
-      return()
-    endif ()
-  endif ()
-  message(FATAL_ERROR "No SDL3 target found (looked for SDL3::SDL3 and SDL3::SDL3-static)")
-endfunction()
-
-# ── Auto: resolve provider based on platform availability ──
-set(_aurora_sdl3_provider "${AURORA_SDL3_PROVIDER}")
-if (_aurora_sdl3_provider STREQUAL "auto")
-  # Prebuilt SDL3 packages are available for Windows (MSVC and MinGW)
-  if (WIN32)
-    set(_aurora_sdl3_provider "package")
-  else ()
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    find_package(SDL3 QUIET)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-    if (SDL3_FOUND)
-      set(_aurora_sdl3_provider "system")
-    else ()
-      set(_aurora_sdl3_provider "vendor")
-    endif ()
-  endif ()
-  set(AURORA_SDL3_PROVIDER "${_aurora_sdl3_provider}" CACHE STRING "" FORCE)
-  message(STATUS "aurora: SDL3 auto-resolved provider: ${_aurora_sdl3_provider}")
-endif ()
-
-if (_aurora_sdl3_provider STREQUAL "system")
-  # ── System: find_package(SDL3) ──
-  message(STATUS "aurora: Using system SDL3 (provider=system)")
-  if (NOT SDL3_FOUND)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-    find_package(SDL3 REQUIRED)
-    set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-  endif ()
-  _aurora_sdl3_select_target()
-
-elseif (_aurora_sdl3_provider STREQUAL "package")
-  # ── Package: download custom build or official SDL3 development package ──
-  if (NOT AURORA_SDL3_PACKAGE_URL)
-    if (MINGW)
-      # WIN32 is also true for MinGW. Select the matching GNU-ABI package
-      # before considering Visual C++ packages.
-      set(AURORA_SDL3_PACKAGE_URL
-        "https://github.com/libsdl-org/SDL/releases/download/release-${AURORA_SDL3_VERSION}/SDL3-devel-${AURORA_SDL3_VERSION}-mingw.tar.gz")
-    elseif (WIN32)
-      # We have custom builds of SDL3 for Win32 x86/AMD64 with libusb support included
-      if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(AMD64|x86)$")
-        string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _sdl3_arch)
-        set(AURORA_SDL3_PACKAGE_URL
-          "https://github.com/encounter/sdl3-build/releases/download/v${AURORA_SDL3_VERSION}/SDL3-windows-${_sdl3_arch}.tar.gz")
-      else ()
-        set(AURORA_SDL3_PACKAGE_URL
-          "https://github.com/libsdl-org/SDL/releases/download/release-${AURORA_SDL3_VERSION}/SDL3-devel-${AURORA_SDL3_VERSION}-VC.zip")
-      endif ()
-    else ()
-      message(FATAL_ERROR
-        "AURORA_SDL3_PROVIDER=package requires AURORA_SDL3_PACKAGE_URL on non-Windows platforms.\n"
-        "Official SDL3 packages: https://github.com/libsdl-org/SDL/releases")
-    endif ()
-  endif ()
-  message(STATUS "aurora: Fetching prebuilt SDL3 package from ${AURORA_SDL3_PACKAGE_URL}")
-
-  include(FetchContent)
-  FetchContent_Declare(sdl3_prebuilt
-    URL "${AURORA_SDL3_PACKAGE_URL}"
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-  )
-  FetchContent_MakeAvailable(sdl3_prebuilt)
-
-  set(_sdl3_search_paths
-    "${sdl3_prebuilt_SOURCE_DIR}/cmake"
-    "${sdl3_prebuilt_SOURCE_DIR}/lib/cmake/SDL3"
-    "${sdl3_prebuilt_SOURCE_DIR}"
-  )
-  file(GLOB _sdl3_subdirs "${sdl3_prebuilt_SOURCE_DIR}/SDL3-*")
-  foreach (_sd IN LISTS _sdl3_subdirs)
-    list(APPEND _sdl3_search_paths
-      "${_sd}/cmake"
-      "${_sd}/lib/cmake/SDL3"
-      "${_sd}"
-    )
-  endforeach ()
-
-  set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-  find_package(SDL3 REQUIRED CONFIG PATHS ${_sdl3_search_paths} NO_DEFAULT_PATH)
-  set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL OFF)
-  _aurora_sdl3_select_target()
-
-elseif (_aurora_sdl3_provider STREQUAL "vendor")
-  # ── Vendor: FetchContent build from source ──
-  if (NOT TARGET SDL3-static AND NOT TARGET SDL3-shared)
-    message(STATUS "aurora: Fetching SDL3 (provider=vendor)")
-
-    if (AURORA_SDL3_LINKAGE STREQUAL "static")
-      set(SDL_STATIC ON CACHE BOOL "Build SDL3 static library" FORCE)
-      set(SDL_SHARED OFF CACHE BOOL "Build SDL3 shared library" FORCE)
-    else ()
-      set(SDL_STATIC OFF CACHE BOOL "Build SDL3 static library" FORCE)
-      set(SDL_SHARED ON CACHE BOOL "Build SDL3 shared library" FORCE)
-    endif ()
-    if (WIN32)
-      set(SDL_LIBC ON CACHE BOOL "Use the system C library" FORCE)
-      if (AURORA_SDL3_LIBUSB)
-        include("${CMAKE_CURRENT_LIST_DIR}/AuroraLibUSB.cmake")
-      endif ()
-    endif ()
-
-    include(FetchContent)
-    # Source fixes for the vendored SDL (see AuroraSDL3Patches.cmake). A freshly
-    # downloaded tarball is patched by the PATCH_COMMAND; a tree handed in through
-    # FETCHCONTENT_SOURCE_DIR_SDL skips the download steps, so patch it here.
-    set(_aurora_sdl3_patches "${CMAKE_CURRENT_LIST_DIR}/AuroraSDL3Patches.cmake")
-    include("${_aurora_sdl3_patches}")
-    if (DEFINED FETCHCONTENT_SOURCE_DIR_SDL AND EXISTS "${FETCHCONTENT_SOURCE_DIR_SDL}")
-      aurora_sdl3_apply_patches("${FETCHCONTENT_SOURCE_DIR_SDL}")
-    endif ()
-    FetchContent_Declare(SDL
-      URL "https://github.com/libsdl-org/SDL/releases/download/release-${AURORA_SDL3_VERSION}/SDL3-${AURORA_SDL3_VERSION}.tar.gz"
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      PATCH_COMMAND "${CMAKE_COMMAND}" -DSDL_SOURCE_DIR=<SOURCE_DIR> -P "${_aurora_sdl3_patches}"
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(SDL)
-  else ()
-    message(STATUS "aurora: Using existing SDL3")
-  endif ()
-  _aurora_sdl3_select_target()
-
-else ()
-  message(FATAL_ERROR "Invalid AURORA_SDL3_PROVIDER: ${AURORA_SDL3_PROVIDER} "
-    "(must be auto, vendor, system, or package)")
-endif ()

aurora-main/cmake/aurora_card.cmake

@@ -1,17 +0,0 @@
-add_library(aurora_card STATIC
-        lib/card/BlockAllocationTable.cpp
-        lib/card/CardRawFile.cpp
-        lib/card/CardGciFolder.cpp
-        lib/card/Directory.cpp
-        lib/card/DolphinCardPath.cpp
-        lib/card/File.cpp
-        lib/card/FileIO.cpp
-        lib/card/SRAM.cpp
-        lib/card/Util.cpp
-        lib/dolphin/card.cpp
-)
-add_library(aurora::card ALIAS aurora_card)
-set_target_properties(aurora_card PROPERTIES FOLDER "aurora")
-
-target_link_libraries(aurora_card PUBLIC aurora::core)
-target_include_directories(aurora_card PRIVATE include)

aurora-main/cmake/aurora_core.cmake

@@ -1,64 +0,0 @@
-add_library(aurora_core STATIC
-        lib/aurora.cpp
-        lib/input.cpp
-        lib/window.cpp
-        lib/logging.cpp
-        lib/system_info.cpp
-        lib/system_info.hpp
-)
-add_library(aurora::core ALIAS aurora_core)
-set_target_properties(aurora_core PROPERTIES FOLDER "aurora")
-
-target_compile_definitions(aurora_core PUBLIC AURORA TARGET_PC)
-target_include_directories(aurora_core PUBLIC include)
-target_link_libraries(aurora_core PUBLIC fmt::fmt ${AURORA_SDL3_TARGET} xxhash)
-target_link_libraries(aurora_core PRIVATE absl::btree absl::flat_hash_map sqlite3 TracyClient)
-if (AURORA_ENABLE_GX AND AURORA_CACHE_USE_ZSTD)
-    target_compile_definitions(aurora_core PRIVATE AURORA_CACHE_USE_ZSTD)
-    target_link_libraries(aurora_core PRIVATE libzstd_static)
-endif ()
-
-if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-    # stuff for fetching system info.
-    target_link_libraries(aurora_core PRIVATE ntdll dxgi advapi32 user32)
-elseif (APPLE)
-    target_sources(aurora_core PRIVATE lib/system_info_mac.mm)
-endif ()
-
-if (AURORA_ENABLE_GX)
-    target_sources(aurora_core PRIVATE lib/imgui.cpp)
-    target_link_libraries(aurora_core PUBLIC imgui)
-endif ()
-
-if (AURORA_ENABLE_GX)
-    target_compile_definitions(aurora_core PUBLIC AURORA_ENABLE_GX WEBGPU_DAWN)
-    target_sources(aurora_core PRIVATE lib/webgpu/gpu.cpp lib/webgpu/gpu_cache.cpp lib/dawn/BackendBinding.cpp)
-    target_link_libraries(aurora_core PRIVATE dawn::webgpu_dawn)
-    if (DAWN_ENABLE_VULKAN)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_VULKAN)
-    endif ()
-    if (DAWN_ENABLE_METAL)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_METAL)
-        target_sources(aurora_core PRIVATE lib/dawn/MetalBinding.mm)
-        set_source_files_properties(lib/dawn/MetalBinding.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-        target_link_options(aurora_core PUBLIC "LINKER:-weak_framework,Metal")
-    endif ()
-    if (DAWN_ENABLE_D3D11)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_D3D11)
-    endif ()
-    if (DAWN_ENABLE_D3D12)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_D3D12)
-    endif ()
-    if (DAWN_ENABLE_DESKTOP_GL OR DAWN_ENABLE_OPENGLES)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_OPENGL)
-        if (DAWN_ENABLE_DESKTOP_GL)
-            target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_DESKTOP_GL)
-        endif ()
-        if (DAWN_ENABLE_OPENGLES)
-            target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_OPENGLES)
-        endif ()
-    endif ()
-    if (DAWN_ENABLE_NULL)
-        target_compile_definitions(aurora_core PRIVATE DAWN_ENABLE_BACKEND_NULL)
-    endif ()
-endif ()

aurora-main/cmake/aurora_dvd.cmake

@@ -1,10 +0,0 @@
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AuroraNodProvider.cmake)
-
-add_library(aurora_dvd STATIC lib/dolphin/dvd/dvd.cpp)
-add_library(aurora::dvd ALIAS aurora_dvd)
-set_target_properties(aurora_dvd PROPERTIES FOLDER "aurora")
-
-target_compile_definitions(aurora_dvd PUBLIC AURORA TARGET_PC)
-target_include_directories(aurora_dvd PUBLIC include)
-target_link_libraries(aurora_dvd PUBLIC nod::nod ${AURORA_SDL3_TARGET})
-target_link_libraries(aurora_dvd PRIVATE fmt::fmt)

aurora-main/cmake/aurora_gd.cmake

@@ -1,16 +0,0 @@
-add_library(aurora_gd STATIC
-        lib/dolphin/gd/GDBase.cpp
-        lib/dolphin/gd/GDGeometry.cpp
-        lib/dolphin/gd/GDIndirect.cpp
-        lib/dolphin/gd/GDLight.cpp
-        lib/dolphin/gd/GDPixel.cpp
-        lib/dolphin/gd/GDTev.cpp
-        lib/dolphin/gd/GDTexture.cpp
-        lib/dolphin/gd/GDTransform.cpp
-        lib/dolphin/gd/gd.hpp
-        lib/dolphin/gd/GDAurora.cpp
-)
-add_library(aurora::gd ALIAS aurora_gd)
-set_target_properties(aurora_gd PROPERTIES FOLDER "aurora")
-
-target_link_libraries(aurora_gd PUBLIC aurora::gx)

aurora-main/cmake/aurora_gx.cmake

@@ -1,47 +0,0 @@
-add_library(aurora_gx STATIC
-        lib/gfx/clear.cpp
-        lib/gfx/common.cpp
-        lib/gfx/depth_peek.cpp
-        lib/gfx/efb_ram_copy.cpp
-        lib/gfx/efb_ram_encoder.cpp
-        lib/gfx/pipeline_cache.cpp
-        lib/gfx/dds_io.cpp
-        lib/gfx/tex_copy_conv.cpp
-        lib/gfx/tex_palette_conv.cpp
-        lib/gfx/texture.cpp
-        lib/gfx/texture_convert.cpp
-        lib/gfx/texture_replacement.cpp
-        lib/gx/command_processor.cpp
-        lib/gx/fifo.cpp
-        lib/gx/frame_interpolation.cpp
-        lib/gx/gx.cpp
-        lib/gx/pipeline.cpp
-        lib/gx/shader.cpp
-        lib/gx/shader_info.cpp
-        lib/dolphin/gx/GXBump.cpp
-        lib/dolphin/gx/GXCull.cpp
-        lib/dolphin/gx/GXCpu2Efb.cpp
-        lib/dolphin/gx/GXDispList.cpp
-        lib/dolphin/gx/GXDraw.cpp
-        lib/dolphin/gx/GXExtra.cpp
-        lib/dolphin/gx/GXFifo.cpp
-        lib/dolphin/gx/GXFrameBuffer.cpp
-        lib/dolphin/gx/GXGeometry.cpp
-        lib/dolphin/gx/GXGet.cpp
-        lib/dolphin/gx/GXLighting.cpp
-        lib/dolphin/gx/GXManage.cpp
-        lib/dolphin/gx/GXPixel.cpp
-        lib/dolphin/gx/GXTev.cpp
-        lib/dolphin/gx/GXTexture.cpp
-        lib/dolphin/gx/GXTransform.cpp
-        lib/dolphin/gx/GXVert.cpp
-        lib/dolphin/gx/GXAurora.cpp
-        lib/gfx/png_io.cpp
-        lib/gfx/png_io.hpp
-)
-add_library(aurora::gx ALIAS aurora_gx)
-set_target_properties(aurora_gx PROPERTIES FOLDER "aurora")
-
-target_link_libraries(aurora_gx PUBLIC aurora::core xxhash)
-target_link_libraries(aurora_gx PRIVATE absl::btree absl::flat_hash_map dawn::webgpu_dawn sqlite3 TracyClient PNG::PNG)
-target_compile_definitions(aurora_gx PRIVATE WEBGPU_DAWN)

aurora-main/cmake/aurora_main.cmake

@@ -1,6 +0,0 @@
-add_library(aurora_main STATIC lib/main.cpp)
-add_library(aurora::main ALIAS aurora_main)
-set_target_properties(aurora_main PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_main PUBLIC include)
-target_link_libraries(aurora_main PUBLIC ${AURORA_SDL3_TARGET})

aurora-main/cmake/aurora_ms.cmake

@@ -1,7 +0,0 @@
-add_library(aurora_ms STATIC lib/dolphin/ms/mouse.cpp)
-add_library(aurora::ms ALIAS aurora_ms)
-set_target_properties(aurora_ms PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_ms PUBLIC include)
-target_link_libraries(aurora_ms PUBLIC aurora::core)
-target_link_libraries(aurora_ms PRIVATE absl::flat_hash_map)

aurora-main/cmake/aurora_mtx.cmake

@@ -1,12 +0,0 @@
-add_library(aurora_mtx STATIC
-  lib/dolphin/mtx/mtx.c
-  lib/dolphin/mtx/mtxstack.c
-  lib/dolphin/mtx/mtxvec.c
-  lib/dolphin/mtx/mtx44.c
-  lib/dolphin/mtx/vec.c
-  lib/dolphin/mtx/quat.c
-)
-add_library(aurora::mtx ALIAS aurora_mtx)
-set_target_properties(aurora_mtx PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_mtx PUBLIC include)

aurora-main/cmake/aurora_os.cmake

@@ -1,14 +0,0 @@
-add_library(aurora_os STATIC lib/dolphin/os/OSInit.cpp
-        lib/dolphin/os/OSMemory.cpp
-        lib/dolphin/os/internal.hpp
-        lib/dolphin/os/OSBootInfo.cpp
-        lib/dolphin/os/OSTime.cpp
-        lib/dolphin/os/OSArena.cpp
-        lib/dolphin/os/OSAlloc.cpp
-        lib/dolphin/os/OSAddress.cpp
-        lib/dolphin/AR.cpp)
-add_library(aurora::os ALIAS aurora_os)
-set_target_properties(aurora_os PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_os PUBLIC include)
-target_link_libraries(aurora_os PRIVATE aurora::core)

aurora-main/cmake/aurora_pad.cmake

@@ -1,7 +0,0 @@
-add_library(aurora_pad STATIC lib/dolphin/pad/pad.cpp)
-add_library(aurora::pad ALIAS aurora_pad)
-set_target_properties(aurora_pad PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_pad PUBLIC include)
-target_link_libraries(aurora_pad PUBLIC aurora::core aurora::si)
-target_link_libraries(aurora_pad PRIVATE absl::flat_hash_map)

aurora-main/cmake/aurora_si.cmake

@@ -1,7 +0,0 @@
-add_library(aurora_si STATIC lib/dolphin/si/si.cpp)
-add_library(aurora::si ALIAS aurora_si)
-set_target_properties(aurora_si PROPERTIES FOLDER "aurora")
-
-target_include_directories(aurora_si PUBLIC include)
-target_link_libraries(aurora_si PUBLIC aurora::core)
-target_link_libraries(aurora_si PRIVATE absl::flat_hash_map)

aurora-main/cmake/aurora_vi.cmake

@@ -1,7 +0,0 @@
-add_library(aurora_vi STATIC
-        lib/dolphin/vi/vi.cpp
-)
-add_library(aurora::vi ALIAS aurora_vi)
-set_target_properties(aurora_vi PROPERTIES FOLDER "aurora")
-
-target_link_libraries(aurora_vi PUBLIC aurora::core)

aurora-main/cmake/libusb/config.h

@@ -1,8 +0,0 @@
-/* libusb build configuration for the Windows backend (MinGW/Clang). */
-#pragma once
-
-#define PLATFORM_WINDOWS 1
-#define ENABLE_LOGGING 1
-#define DEFAULT_VISIBILITY
-#define HAVE_STRUCT_TIMESPEC 1
-#define PRINTF_FORMAT(a, b) __attribute__((__format__(__printf__, a, b)))

aurora-main/docs/building.md

@@ -1,55 +0,0 @@
-# Building
-
-## Prerequisites
-
-- CMake 3.25 or later
-- A C++20 compatible compiler (Clang, GCC, or MSVC)
-- Git (for cloning)
-
-## Building the Examples
-
-To build Aurora's included examples:
-
-```bash
-git clone https://github.com/encounter/aurora.git
-cd aurora
-mkdir build && cd build
-cmake ..
-cmake --build . --target simple
-```
-
-The `simple` example demonstrates a minimal Aurora application with a blue screen. The built executable will be in `build/examples/simple`.
-
-## Using Aurora in Your Project
-
-Aurora is designed to be integrated as a library in GameCube/Wii decompilation projects.
-
-**CMakeLists.txt example:**
-
-```cmake
-cmake_minimum_required(VERSION 3.25)
-project(your_game)
-
-# Add Aurora as a subdirectory
-add_subdirectory(extern/aurora EXCLUDE_FROM_ALL)
-
-# Create your executable
-add_executable(your_game src/main.c)
-
-# Link against Aurora components
-target_link_libraries(your_game PRIVATE 
-    aurora::core 
-    aurora::gx 
-    aurora::main 
-    aurora::vi
-)
-```
-
-See [examples/simple.c](../examples/simple.c) for a minimal application template.
-
-## CMake Options
-
-- `AURORA_ENABLE_GX` (default: ON) - Enable GX implementation and WebGPU renderer
-- `AURORA_ENABLE_DVD` (default: OFF) - Enable DVD implementation backed by nod
-- `AURORA_ENABLE_CARD` (default: ON) - Enable CARD implementation based on kabufuda
-- `AURORA_CACHE_USE_ZSTD` (default: ON) - Compress WebGPU cache entries with zstd

aurora-main/examples/CMakeLists.txt

@@ -1,4 +0,0 @@
-if (AURORA_ENABLE_GX)
-  add_executable(simple simple.c)
-  target_link_libraries(simple PRIVATE aurora::core aurora::gx aurora::main aurora::vi)
-endif ()

aurora-main/examples/simple.c

@@ -1,90 +0,0 @@
-#include <aurora/aurora.h>
-#include <aurora/event.h>
-#include <aurora/main.h>
-#include <dolphin/gx.h>
-#include <dolphin/os.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-static void log_callback(AuroraLogLevel level, const char* module, const char* message, unsigned int len) {
-  const char* levelStr;
-  FILE* out = stdout;
-  switch (level) {
-  case LOG_DEBUG:
-    levelStr = "DEBUG";
-    break;
-  case LOG_INFO:
-    levelStr = "INFO";
-    break;
-  case LOG_WARNING:
-    levelStr = "WARNING";
-    break;
-  case LOG_ERROR:
-    levelStr = "ERROR";
-    out = stderr;
-    break;
-  case LOG_FATAL:
-    levelStr = "FATAL";
-    out = stderr;
-    break;
-  }
-  fprintf(out, "[%s: %s;%s]\n", levelStr, module, message);
-  if (level == LOG_FATAL) {
-    fflush(out);
-    abort();
-  }
-}
-
-static void draw() {
-  GXSetCopyClear(
-      (GXColor){
-          .r = 0,
-          .g = 0,
-          .b = 100,
-          .a = 255,
-      },
-      GX_MAX_Z24);
-}
-
-int main(int argc, char* argv[]) {
-  const AuroraConfig config = {
-      .appName = "Demo",
-      .logCallback = &log_callback,
-  };
-  AuroraInfo initInfo = aurora_initialize(argc, argv, &config);
-
-  bool exiting = false;
-  bool paused = false;
-  while (!exiting) {
-    const AuroraEvent* event = aurora_update();
-    while (event != NULL && event->type != AURORA_NONE) {
-      switch (event->type) {
-      case AURORA_EXIT:
-        exiting = true;
-        break;
-      case AURORA_PAUSED:
-        paused = true;
-        break;
-      case AURORA_UNPAUSED:
-        paused = false;
-        break;
-      case AURORA_WINDOW_RESIZED:
-        initInfo.windowSize = event->windowSize;
-        break;
-      default:
-        break;
-      }
-      ++event;
-    }
-    if (exiting || paused || !aurora_begin_frame()) {
-      continue;
-    }
-    draw();
-    aurora_end_frame();
-  }
-
-  aurora_shutdown();
-  return 0;
-}

aurora-main/extern/CMakeLists.txt

@@ -1,310 +0,0 @@
-include(FetchContent)
-
-# Don't build tests for third party dependencies
-set(BUILD_TESTING OFF CACHE INTERNAL "Build tests")
-set(SKIP_INSTALL_ALL ON)
-if (NOT DEFINED BUILD_SHARED_LIBS)
-  set(_USE_SHARED ON)
-else ()
-  set(_USE_SHARED OFF)
-endif ()
-
-function(aurora_find_package_global)
-  set(_PREV_FIND_PACKAGE_TARGETS_GLOBAL ${CMAKE_FIND_PACKAGE_TARGETS_GLOBAL})
-  set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON)
-  find_package(${ARGV})
-  set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ${_PREV_FIND_PACKAGE_TARGETS_GLOBAL})
-endfunction()
-
-if (AURORA_ENABLE_GX)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/AuroraDawnProvider.cmake)
-endif ()
-
-# Abseil is needed for core libraries. It normally comes via Dawn's vendor build.
-# Otherwise prefer a system package and only fetch it as a last resort.
-if (NOT TARGET absl::flat_hash_map OR NOT TARGET absl::btree)
-  aurora_find_package_global(absl CONFIG QUIET GLOBAL)
-endif ()
-
-if (TARGET absl::flat_hash_map AND TARGET absl::btree)
-  message(STATUS "aurora: Using system/existing abseil")
-else ()
-  message(STATUS "aurora: Fetching abseil-cpp (standalone)")
-  if(NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY OR CMAKE_MSVC_RUNTIME_LIBRARY MATCHES "DLL$")
-    set(ABSL_MSVC_STATIC_RUNTIME OFF CACHE INTERNAL "Link static runtime libraries")
-  else()
-    set(ABSL_MSVC_STATIC_RUNTIME ON CACHE INTERNAL "Link static runtime libraries")
-  endif()
-  set(ABSL_PROPAGATE_CXX_STD ON)
-  FetchContent_Declare(abseil-cpp
-    URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    EXCLUDE_FROM_ALL
-  )
-  FetchContent_MakeAvailable(abseil-cpp)
-  if (NOT TARGET absl::flat_hash_map OR NOT TARGET absl::btree)
-    message(FATAL_ERROR "Failed to make abseil-cpp available")
-  endif ()
-endif ()
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/AuroraSDL3Provider.cmake)
-
-if (NOT TARGET xxhash)
-  message(STATUS "aurora: Fetching xxhash")
-  FetchContent_Declare(xxhash
-    URL https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.3.tar.gz
-    URL_HASH SHA256=aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80
-    SOURCE_SUBDIR cmake_unofficial
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    EXCLUDE_FROM_ALL
-  )
-  set(XXHASH_BUILD_XXHSUM OFF CACHE INTERNAL "Build the xxhsum binary")
-  # xxhash uses CMAKE_DEPENDENT_OPTION(BUILD_SHARED_LIBS ...) which writes
-  # a sticky CACHE INTERNAL entry on reconfigure. Undo it afterward.
-  set(_aurora_xxhash_saved_bsl "${BUILD_SHARED_LIBS}")
-  FetchContent_MakeAvailable(xxhash)
-  unset(BUILD_SHARED_LIBS CACHE)
-  set(BUILD_SHARED_LIBS "${_aurora_xxhash_saved_bsl}")
-  unset(_aurora_xxhash_saved_bsl)
-  if (NOT TARGET xxhash)
-    message(FATAL_ERROR "Failed to make xxhash available")
-  endif ()
-else ()
-  message(STATUS "aurora: Using existing xxhash")
-endif ()
-
-if (NOT TARGET fmt)
-  message(STATUS "aurora: Fetching fmt")
-  FetchContent_Declare(fmt
-    URL https://github.com/fmtlib/fmt/archive/refs/tags/11.1.4.tar.gz
-    URL_HASH SHA256=ac366b7b4c2e9f0dde63a59b3feb5ee59b67974b14ee5dc9ea8ad78aa2c1ee1e
-    DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    EXCLUDE_FROM_ALL
-  )
-  FetchContent_MakeAvailable(fmt)
-  if (NOT TARGET fmt)
-    message(FATAL_ERROR "Failed to make fmt available")
-  endif ()
-else ()
-  message(STATUS "aurora: Using existing fmt")
-endif ()
-
-# fmt 11.1 drops its libc++ transitive includes but still calls malloc/free without <cstdlib>.
-# Force the missing header for fmt and its consumers until the pinned release is updated.
-if (MINGW AND TARGET fmt)
-  target_compile_options(fmt PUBLIC
-    $<$<COMPILE_LANGUAGE:CXX>:-include>
-    $<$<COMPILE_LANGUAGE:CXX>:cstdlib>)
-endif ()
-
-if (AURORA_ENABLE_GX)
-  if (NOT TARGET ZLIB::ZLIB)
-    aurora_find_package_global(ZLIB QUIET)
-  endif ()
-  if (NOT TARGET ZLIB::ZLIB)
-    message(STATUS "aurora: Fetching zlib")
-    set(_AURORA_ZLIB_SHARED ${_USE_SHARED})
-    # ClangCL injects Clang's C headers into the MSVC resource compiler path, and zlib's DLL version
-    # resource then hits syntax rc.exe cannot parse. Use the resource-free static target here.
-    if (MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      set(_AURORA_ZLIB_SHARED OFF)
-    endif ()
-    set(ZLIB_BUILD_SHARED ${_AURORA_ZLIB_SHARED} CACHE BOOL "Enable building zlib shared library" FORCE)
-    set(ZLIB_BUILD_TESTING OFF CACHE BOOL "Enable Zlib Examples as tests" FORCE)
-    set(ZLIB_INSTALL OFF CACHE BOOL "Enable installation of zlib" FORCE)
-    FetchContent_Declare(
-      ZLIB
-      URL https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz
-      URL_HASH SHA256=bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(ZLIB)
-    if (NOT TARGET ZLIB::ZLIB AND TARGET ZLIB::ZLIBSTATIC)
-      add_library(ZLIB::ZLIB ALIAS zlibstatic)
-    endif ()
-    if (NOT TARGET ZLIB::ZLIB)
-      message(FATAL_ERROR "Failed to make zlib available")
-    endif ()
-    # libpng calls find_package(ZLIB) even when zlib was already provided by FetchContent.
-    file(WRITE "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/ZLIBConfig.cmake"
-      "set(ZLIB_FOUND TRUE)\n"
-      "set(ZLIB_INCLUDE_DIR \"${zlib_SOURCE_DIR}\")\n"
-      "set(ZLIB_INCLUDE_DIRS \"${zlib_BINARY_DIR};${zlib_SOURCE_DIR}\")\n"
-    )
-  endif ()
-
-  if (NOT TARGET PNG::PNG)
-    if (TARGET png_shared AND _USE_SHARED)
-      add_library(PNG::PNG ALIAS png_shared)
-    elseif (TARGET png_static)
-      add_library(PNG::PNG ALIAS png_static)
-    else ()
-      aurora_find_package_global(PNG QUIET)
-    endif ()
-  endif ()
-  if (NOT TARGET PNG::PNG)
-    message(STATUS "aurora: Fetching libpng")
-    set(PNG_SHARED ${_USE_SHARED} CACHE BOOL "Build libpng as a shared library" FORCE)
-    set(PNG_TESTS OFF CACHE BOOL "Build the libpng tests" FORCE)
-    set(PNG_TOOLS OFF CACHE BOOL "Build the libpng tools" FORCE)
-    FetchContent_Declare(
-      PNG
-      URL https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.58.tar.gz
-      URL_HASH SHA256=A9D4DF463D36A6E5F9C29BD6F4967312D17E996C1854F3511F833924EB1993CF
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(PNG)
-    if (TARGET png_shared AND _USE_SHARED)
-      add_library(PNG::PNG ALIAS png_shared)
-    elseif (TARGET png_static)
-      add_library(PNG::PNG ALIAS png_static)
-    else ()
-      message(FATAL_ERROR "Failed to make libpng available")
-    endif ()
-  else ()
-    message(STATUS "aurora: Using existing libpng")
-  endif ()
-
-  aurora_find_package_global(Freetype QUIET)
-  if (NOT TARGET Freetype::Freetype)
-    message(STATUS "aurora: Fetching Freetype")
-    set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE)
-    set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE)
-    set(FT_DISABLE_PNG ON CACHE BOOL "" FORCE)
-    FetchContent_Declare(Freetype
-      URL https://files.twilitrealm.dev/freetype-2.14.3.tar.gz
-      URL_HASH SHA256=e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(Freetype)
-    add_library(Freetype::Freetype ALIAS freetype)
-  else ()
-    message(STATUS "aurora: Using existing Freetype")
-  endif ()
-
-  if (NOT TARGET imgui)
-    message(STATUS "aurora: Fetching imgui")
-    FetchContent_Declare(imgui
-      URL https://github.com/ocornut/imgui/archive/refs/tags/v1.91.9b-docking.tar.gz
-      URL_HASH SHA256=466fdef9b18de15f0bb6e288e3d00ffa3d82200ec458ce5e4f724a161d9528a5
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(imgui)
-
-    add_library(imgui STATIC
-      ${imgui_SOURCE_DIR}/imgui.cpp
-      ${imgui_SOURCE_DIR}/imgui_demo.cpp
-      ${imgui_SOURCE_DIR}/imgui_draw.cpp
-      ${imgui_SOURCE_DIR}/imgui_tables.cpp
-      ${imgui_SOURCE_DIR}/imgui_widgets.cpp
-      ${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp
-    )
-    target_include_directories(imgui PUBLIC ${imgui_SOURCE_DIR})
-
-    add_library(imgui_backends STATIC
-      ${imgui_SOURCE_DIR}/backends/imgui_impl_sdl3.cpp
-      ${imgui_SOURCE_DIR}/backends/imgui_impl_sdlrenderer3.cpp
-      ${imgui_SOURCE_DIR}/backends/imgui_impl_wgpu.cpp
-    )
-    target_compile_definitions(imgui_backends PRIVATE IMGUI_IMPL_WEBGPU_BACKEND_DAWN)
-    target_link_libraries(imgui_backends PRIVATE imgui ${AURORA_SDL3_TARGET} dawn::webgpu_dawn)
-    target_link_libraries(imgui PUBLIC imgui_backends)
-
-    if (TARGET Freetype::Freetype)
-      target_sources(imgui PRIVATE ${imgui_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp)
-      target_compile_definitions(imgui PUBLIC IMGUI_ENABLE_FREETYPE)
-      target_link_libraries(imgui PRIVATE Freetype::Freetype)
-    endif ()
-  else ()
-    message(STATUS "aurora: Using existing imgui")
-  endif ()
-
-  if (TARGET imgui)
-    target_include_directories(imgui PUBLIC ${PROJECT_SOURCE_DIR}/include)
-    target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="aurora/imgui_config.h")
-    target_sources(imgui PRIVATE ${PROJECT_SOURCE_DIR}/lib/imgui_config.cpp)
-    target_link_libraries(imgui PRIVATE ${AURORA_SDL3_TARGET})
-  endif ()
-
-  if (NOT TARGET sqlite3)
-    message(STATUS "aurora: Fetching sqlite3")
-    FetchContent_Declare(sqlite3
-      URL https://sqlite.org/2026/sqlite-amalgamation-3510300.zip
-      URL_HASH SHA256=acb1e6f5d832484bf6d32b681e858c38add8b2acdfd42ac5df24b8afb46552b4
-      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-      EXCLUDE_FROM_ALL
-    )
-    FetchContent_MakeAvailable(sqlite3)
-
-    add_library(sqlite3 STATIC ${sqlite3_SOURCE_DIR}/sqlite3.c)
-    target_include_directories(sqlite3 PUBLIC ${sqlite3_SOURCE_DIR})
-  else ()
-    message(STATUS "aurora: Using existing sqlite3")
-  endif ()
-
-  if (AURORA_CACHE_USE_ZSTD)
-    if (NOT TARGET libzstd_static)
-      message(STATUS "aurora: Fetching zstd")
-      set(ZSTD_BUILD_STATIC ON)
-      set(ZSTD_BUILD_SHARED OFF)
-      set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "BUILD PROGRAMS" FORCE)
-      set(ZSTD_BUILD_TESTS OFF CACHE BOOL "BUILD TESTS" FORCE)
-
-      if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(C_FLAG_WALL TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WALL TRUE CACHE INTERNAL "")
-        set(C_FLAG_WEXTRA TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WEXTRA TRUE CACHE INTERNAL "")
-        set(C_FLAG_WUNDEF TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WUNDEF TRUE CACHE INTERNAL "")
-        set(C_FLAG_WSHADOW TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WSHADOW TRUE CACHE INTERNAL "")
-        set(C_FLAG_WCAST_ALIGN TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WCAST_ALIGN TRUE CACHE INTERNAL "")
-        set(C_FLAG_WCAST_QUAL TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WCAST_QUAL TRUE CACHE INTERNAL "")
-        set(C_FLAG_WSTRICT_PROTOTYPES TRUE CACHE INTERNAL "")
-        set(LD_FLAG_WL_Z_NOEXECSTACK FALSE CACHE INTERNAL "")
-        set(C_FLAG_QUNUSED_ARGUMENTS TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_QUNUSED_ARGUMENTS TRUE CACHE INTERNAL "")
-        set(C_FLAG_WA_NOEXECSTACK TRUE CACHE INTERNAL "")
-        set(CXX_FLAG_WA_NOEXECSTACK TRUE CACHE INTERNAL "")
-      endif()
-
-      FetchContent_Declare(zstd
-        URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz
-        URL_HASH SHA256=eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3
-        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-        SOURCE_SUBDIR build/cmake
-        EXCLUDE_FROM_ALL
-      )
-      FetchContent_MakeAvailable(zstd)
-    else ()
-      message(STATUS "aurora: Using existing zstd")
-    endif ()
-  endif ()
-endif ()
-
-if (NOT TARGET TracyClient)
-  message(STATUS "aurora: Fetching Tracy")
-
-  # Default to off, users can enable the cache variable if they want to use it.
-  set(TRACY_ENABLE OFF CACHE BOOL "Enable Tracy profiling")
-
-  FetchContent_Declare(
-          tracy
-          URL https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz
-          URL_HASH SHA256=24d342b5127d7f659dc3cf94f24347b348cc736f25b17a691fd7f69541937658
-          DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-          EXCLUDE_FROM_ALL
-  )
-  FetchContent_MakeAvailable(tracy)
-
-  if (NOT TARGET TracyClient)
-    message(FATAL_ERROR "Failed to make TracyClient available")
-  endif ()
-endif ()

aurora-main/include/aurora/aurora.h

@@ -1,180 +0,0 @@
-#ifndef AURORA_AURORA_H
-#define AURORA_AURORA_H
-
-#ifdef __cplusplus
-#include <cstddef>
-#include <cstdint>
-
-extern "C" {
-#else
-#include "stdbool.h"
-#include "stddef.h"
-#include "stdint.h"
-#endif
-
-typedef enum {
-  BACKEND_AUTO,
-  BACKEND_D3D11,
-  BACKEND_D3D12,
-  BACKEND_METAL,
-  BACKEND_VULKAN,
-  BACKEND_OPENGL,
-  BACKEND_OPENGLES,
-  BACKEND_WEBGPU,
-  BACKEND_NULL,
-} AuroraBackend;
-
-typedef enum {
-  LOG_DEBUG,
-  LOG_INFO,
-  LOG_WARNING,
-  LOG_ERROR,
-  LOG_FATAL,
-} AuroraLogLevel;
-
-typedef enum {
-  AURORA_DISPLAY_MODE_WINDOWED,
-  AURORA_DISPLAY_MODE_BORDERLESS,
-  AURORA_DISPLAY_MODE_EXCLUSIVE,
-} AuroraDisplayMode;
-
-typedef struct {
-  int32_t x;
-  int32_t y;
-} AuroraWindowPos;
-
-typedef struct {
-  uint32_t width;
-  uint32_t height;
-
-  /**
-   * Width of the main GX framebuffer.
-   */
-  uint32_t fb_width;
-
-  /**
-   * Height of the main GX framebuffer.
-   */
-  uint32_t fb_height;
-
-  /**
-   * The size of the framebuffer used to present to the operating system.
-   * May differ from fb_width if Aurora is instructed to force an aspect ratio or resolution configuration.
-   */
-  uint32_t native_fb_width;
-
-  /**
-   * The size of the framebuffer used to present to the operating system.
-   * May differ from fb_height if Aurora is instructed to force an aspect ratio or resolution configuration.
-   */
-  uint32_t native_fb_height;
-  float scale;
-} AuroraWindowSize;
-
-typedef struct SDL_Window SDL_Window;
-typedef struct AuroraEvent AuroraEvent;
-
-typedef void (*AuroraLogCallback)(AuroraLogLevel level, const char* module, const char* message, unsigned int len);
-typedef void (*AuroraImGuiInitCallback)(const AuroraWindowSize* size);
-
-typedef struct {
-  const char* appName;
-  const char* userPath;
-  const char* cachePath;
-  // Read-only application resources. Defaults to SDL_GetBasePath(), which is
-  // where release builds place initial_pipeline_cache.db.
-  const char* resourcesPath;
-  AuroraBackend desiredBackend;
-  uint32_t msaa;
-  uint16_t maxTextureAnisotropy;
-  // No vsync knob exists: the swapchain is always configured for a
-  // non-blocking present mode (Immediate, else Mailbox). See best_present_mode.
-  bool startFullscreen;
-  bool allowJoystickBackgroundEvents;
-  bool pauseOnFocusLost;
-  bool allowTextureReplacements;
-  bool allowTextureDumps;
-  bool disableCopyFilter;
-  // When false, Aurora centers the first window. When true, windowPosX/Y are restored verbatim,
-  // including negative coordinates on monitors left of or above the primary display.
-  bool hasWindowPosition;
-  int32_t windowPosX;
-  int32_t windowPosY;
-  uint32_t windowWidth;
-  uint32_t windowHeight;
-  void* iconRGBA8;
-  uint32_t iconWidth;
-  uint32_t iconHeight;
-  AuroraLogCallback logCallback;
-  AuroraLogLevel logLevel;
-  AuroraImGuiInitCallback imGuiInitCallback;
-
-  /*
-   * The size of the GameCube's main memory, or MEM1 on the Wii.
-   * Note that it will not be allocated at the exact 0x80000000 address, as that cannot be guaranteed.
-   * This can be set to 0 to disable allocating this region.
-   */
-  uint32_t mem1Size;
-
-  /*
-   * The size of the GameCube's ARAM, or MEM2 on the Wii.
-   * This can be set to 0 to disable allocating this region.
-   */
-  uint32_t mem2Size;
-
-  // Optional directory for the portable GX pipeline database. When null, the
-  // database is stored in cachePath with Dawn's machine-specific cache.
-  const char* pipelineCachePath;
-} AuroraConfig;
-
-typedef enum {
-  AURORA_INITIALIZATION_SUCCESS = 0,
-  AURORA_INITIALIZATION_GRAPHICS_UNAVAILABLE = 1,
-} AuroraInitializationStatus;
-
-typedef struct {
-  AuroraBackend backend;
-  const char* userPath;
-  const char* cachePath;
-  SDL_Window* window;
-  AuroraWindowSize windowSize;
-  AuroraInitializationStatus initializationStatus;
-  // On failure, owned by SDL on the calling thread. Copy before another SDL call.
-  const char* initializationError;
-} AuroraInfo;
-
-AuroraInfo aurora_initialize(int argc, char* argv[], const AuroraConfig* config);
-void aurora_shutdown();
-const AuroraEvent* aurora_update();
-bool aurora_begin_frame();
-void aurora_end_frame();
-typedef void (*AuroraFrameWorkerWaitCallback)();
-// Called from the producer thread at bounded intervals while Aurora waits for
-// the asynchronous frame worker. The callback must not enter Aurora.
-void aurora_set_frame_worker_wait_callback(AuroraFrameWorkerWaitCallback callback);
-void aurora_wait_for_frame_worker();
-bool aurora_wait_for_frame_worker_for(uint32_t timeoutMicros);
-// Absolute schedule for the next sealed frame, on steady_clock: baseNanos anchors the group and
-// intervalNanos is the period, so slot k of N+1 fires at base + k*interval/(N+1). Zeros clear it.
-void aurora_set_present_schedule(uint64_t baseNanos, uint64_t intervalNanos);
-// Reports whether the frame about to be sealed met its display boundary. Interpolation sizes its
-// slot group from this, backing off after misses. Only paced presents may report.
-void aurora_report_producer_paced(bool paced);
-void aurora_request_frame_capture(uint32_t frame, const char* outputPath);
-bool aurora_flush_efb_copies_to_ram();
-bool aurora_flush_efb_copy_to_ram(void* dest);
-
-void aurora_set_log_level(AuroraLogLevel level);
-void aurora_set_pause_on_focus_lost(bool value);
-void aurora_set_background_input(bool value);
-void aurora_set_display_mode(AuroraDisplayMode mode);
-AuroraDisplayMode aurora_get_display_mode();
-
-AuroraBackend aurora_get_backend();
-const AuroraBackend* aurora_get_available_backends(size_t* count);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/aurora/dvd.h

@@ -1,27 +0,0 @@
-#ifndef AURORA_DVD_H
-#define AURORA_DVD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <dolphin/types.h>
-
-/**
- * Open a GC/Wii disc image for use by the DVD API.
- * Must be called before DVDInit().
- * Returns true on success, false on failure.
- */
-bool aurora_dvd_open(const char* disc_path);
-
-/**
- * Close the disc image and free all resources.
- */
-void aurora_dvd_close(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/aurora/event.h

@@ -1,44 +0,0 @@
-#ifndef AURORA_EVENT_H
-#define AURORA_EVENT_H
-
-#include "aurora.h"
-
-#include <SDL3/SDL_events.h>
-#include <SDL3/SDL_joystick.h>
-
-#ifdef __cplusplus
-#include <cstdint>
-
-extern "C" {
-#else
-#include "stdint.h"
-#endif
-
-typedef enum {
-  AURORA_NONE,
-  AURORA_EXIT,
-  AURORA_SDL_EVENT,
-  AURORA_WINDOW_MOVED,
-  AURORA_WINDOW_RESIZED,
-  AURORA_CONTROLLER_ADDED,
-  AURORA_CONTROLLER_REMOVED,
-  AURORA_PAUSED,
-  AURORA_UNPAUSED,
-  AURORA_DISPLAY_SCALE_CHANGED,
-} AuroraEventType;
-
-struct AuroraEvent {
-  AuroraEventType type;
-  union {
-    SDL_Event sdl;
-    AuroraWindowPos windowPos;
-    AuroraWindowSize windowSize;
-    SDL_JoystickID controller;
-  };
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/aurora/gfx.h

@@ -1,97 +0,0 @@
-#ifndef AURORA_GFX_H
-#define AURORA_GFX_H
-
-#ifdef __cplusplus
-#include <cstddef>
-#include <cstdint>
-
-extern "C" {
-#else
-#include "stddef.h"
-#include "stdint.h"
-#endif
-
-#ifndef NDEBUG
-#define AURORA_GFX_DEBUG_GROUPS
-#endif
-
-void aurora_push_debug_group(const char* label);
-void aurora_pop_debug_group();
-
-typedef struct {
-  uint32_t queuedPipelines;
-  uint32_t createdPipelines;
-  uint32_t drawCallCount;
-  uint32_t mergedDrawCallCount;
-  uint32_t lastVertSize;
-  uint32_t lastUniformSize;
-  uint32_t lastIndexSize;
-  uint32_t lastStorageSize;
-  uint32_t lastTextureUploadSize;
-  uint32_t presentedFrameCount;
-  uint32_t interpolatedFrameCount;
-} AuroraStats;
-
-typedef struct {
-  uint64_t totalPresentCount;
-  uint32_t sampleCount;
-  double framesPerSecond;
-  double averageFrameTimeMs;
-  double p95FrameTimeMs;
-  double jitterMs;
-  // framesPerSecond with duplicated presentation slots scaled out, so this is the rate of frames
-  // that carried new motion. Equal to framesPerSecond when every slot replayed real interpolation.
-  double effectiveFramesPerSecond;
-} AuroraPresentTiming;
-
-const AuroraStats* aurora_get_stats();
-void aurora_get_present_timing(AuroraPresentTiming* timing);
-
-// Interpolation health: the per-frame fields describe the last sealed frame, the counters
-// accumulate since it was configured. This answers "output FPS dropped but the game held 60".
-typedef struct {
-  uint32_t targetFps;          // configured target, 0 when interpolation is off
-  uint32_t targetSamples;      // slots the pacing controller currently aims for
-  uint32_t activeSamples;      // slots latched for the latest sealed frame
-  uint32_t candidates;         // perspective draws in the latest sealed frame
-  uint32_t matchable;          // candidates whose identity also existed last frame
-  uint32_t matches;            // draws matched to the previous frame
-  uint32_t eligible;           // latest frame inserted interpolated slots
-  uint32_t replaySafe;         // latest frame could replay its command stream
-  uint64_t framesSealed;
-  uint64_t framesLowMatch;
-  uint64_t framesReplayUnsafe;
-  uint64_t slotReductions;
-  uint64_t lateSealDrops;
-} AuroraFrameInterpolationDiagnostics;
-
-void aurora_get_frame_interpolation_diagnostics(AuroraFrameInterpolationDiagnostics* diagnostics);
-
-// Generates transform-interpolated perspective frames between consecutive 60 Hz logical frames.
-// Supported targets are 0 (off), 120, 180 and 240. Guest simulation and VI timing are unchanged.
-void aurora_set_frame_interpolation_fps(uint32_t targetFps);
-uint32_t aurora_get_frame_interpolation_fps();
-
-// Newly encountered GX pipelines compile on the bounded worker queue. Draws whose pipeline is not
-// ready are skipped rather than stalling submission, and pick it up once compilation finishes.
-void aurora_set_skip_unready_pipelines(bool enabled);
-bool aurora_get_skip_unready_pipelines();
-uint32_t aurora_get_queued_pipeline_count();
-
-// Controls whether display copies bypass the Wii's vertical copy filter.
-void aurora_set_disable_copy_filter(bool disabled);
-bool aurora_get_disable_copy_filter();
-
-// Guest-RAM write tracking. `generation` changes whenever guest RAM covering a host range was
-// written (or returns AURORA_GUEST_WRITE_UNTRACKED); `notify` reports writes aurora made itself.
-#define AURORA_GUEST_WRITE_UNTRACKED UINT64_MAX
-typedef uint64_t (*AuroraGuestWriteGenerationCallback)(const void* hostPtr, size_t size);
-typedef void (*AuroraGuestWriteNotifyCallback)(const void* hostPtr, size_t size);
-void aurora_set_guest_write_hooks(AuroraGuestWriteGenerationCallback generation,
-                                  AuroraGuestWriteNotifyCallback notify);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/aurora/imgui.h

@@ -1,20 +0,0 @@
-#ifndef AURORA_IMGUI_H
-#define AURORA_IMGUI_H
-
-#include <imgui.h>
-
-#ifdef __cplusplus
-#include <cstdint>
-
-extern "C" {
-#else
-#include "stdint.h"
-#endif
-
-ImTextureID aurora_imgui_add_texture(uint32_t width, uint32_t height, const void* rgba8);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/aurora/imgui_config.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS 1
-
-typedef struct SDL_IOStream SDL_IOStream;
-typedef SDL_IOStream* ImFileHandle;
-typedef unsigned long long ImU64;
-
-ImFileHandle ImFileOpen(const char* filename, const char* mode);
-bool ImFileClose(ImFileHandle file);
-ImU64 ImFileGetSize(ImFileHandle file);
-ImU64 ImFileRead(void* data, ImU64 size, ImU64 count, ImFileHandle file);
-ImU64 ImFileWrite(const void* data, ImU64 size, ImU64 count, ImFileHandle file);

aurora-main/include/aurora/main.h

@@ -1,16 +0,0 @@
-#ifndef AURORA_MAIN_H
-#define AURORA_MAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int aurora_main(int argc, char* argv[]);
-
-#ifdef __cplusplus
-}
-#endif
-
-#define main aurora_main
-
-#endif

aurora-main/include/aurora/math.hpp

@@ -1,254 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#ifndef AURORA_VEC2_EXTRA
-#define AURORA_VEC2_EXTRA
-#endif
-#ifndef AURORA_VEC3_EXTRA
-#define AURORA_VEC3_EXTRA
-#endif
-#ifndef AURORA_VEC4_EXTRA
-#define AURORA_VEC4_EXTRA
-#endif
-#ifndef AURORA_MAT4X4_EXTRA
-#define AURORA_MAT4X4_EXTRA
-#endif
-
-#ifndef __has_attribute
-#define __has_attribute(x) 0
-#endif
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-#if __has_attribute(vector_size) && !defined(__clang__)
-#define USE_GCC_VECTOR_EXTENSIONS
-#endif
-
-namespace aurora {
-template <typename T>
-struct Vec2 {
-  T x{};
-  T y{};
-
-  constexpr Vec2() = default;
-  constexpr Vec2(T x, T y) : x(x), y(y) {}
-  AURORA_VEC2_EXTRA
-
-  bool operator==(const Vec2& rhs) const { return x == rhs.x && y == rhs.y; }
-  bool operator!=(const Vec2& rhs) const { return !(*this == rhs); }
-};
-template <typename T>
-struct Vec3 {
-  T x{};
-  T y{};
-  T z{};
-
-  constexpr Vec3() = default;
-  constexpr Vec3(T x, T y, T z) : x(x), y(y), z(z) {}
-  AURORA_VEC3_EXTRA
-
-  bool operator==(const Vec3& rhs) const { return x == rhs.x && y == rhs.y && z == rhs.z; }
-  bool operator!=(const Vec3& rhs) const { return !(*this == rhs); }
-};
-template <typename T>
-struct Vec4 {
-#ifdef USE_GCC_VECTOR_EXTENSIONS
-  typedef T Vt __attribute__((vector_size(sizeof(T) * 4)));
-  Vt m;
-#else
-  using Vt = T[4];
-  Vt m;
-#endif
-
-  constexpr Vec4() = default;
-  constexpr Vec4(Vt m) : m(m) {}
-  constexpr Vec4(T x, T y, T z, T w) : m{x, y, z, w} {}
-  // For Vec3 with padding
-  constexpr Vec4(T x, T y, T z) : m{x, y, z, {}} {}
-  // For Vec3 -> Vec4
-  constexpr Vec4(Vec3<T> v, T w) : m{v.x, v.y, v.z, w} {}
-  AURORA_VEC4_EXTRA
-
-  inline Vec4& operator=(const Vec4& other) {
-    memcpy(&m, &other.m, sizeof(Vt));
-    return *this;
-  }
-
-  [[nodiscard]] inline T& x() { return m[0]; }
-  [[nodiscard]] inline T x() const { return m[0]; }
-  [[nodiscard]] inline T& y() { return m[1]; }
-  [[nodiscard]] inline T y() const { return m[1]; }
-  [[nodiscard]] inline T& z() { return m[2]; }
-  [[nodiscard]] inline T z() const { return m[2]; }
-  [[nodiscard]] inline T& w() { return m[3]; }
-  [[nodiscard]] inline T w() const { return m[3]; }
-  [[nodiscard]] inline T& operator[](size_t i) { return m[i]; }
-  [[nodiscard]] inline T operator[](size_t i) const { return m[i]; }
-
-  template <size_t x, size_t y, size_t z, size_t w>
-  [[nodiscard]] constexpr Vec4 shuffle() const {
-    static_assert(x < 4 && y < 4 && z < 4 && w < 4);
-#if defined(USE_GCC_VECTOR_EXTENSIONS) && __has_builtin(__builtin_shuffle)
-    typedef int Vi __attribute__((vector_size(16)));
-    return __builtin_shuffle(m, Vi{x, y, z, w});
-#else
-    return {m[x], m[y], m[z], m[w]};
-#endif
-  }
-
-  bool operator==(const Vec4& rhs) const {
-#if defined(USE_GCC_VECTOR_EXTENSIONS) && __has_builtin(__builtin_reduce_and)
-    return __builtin_reduce_and(m == rhs.m) != 0;
-#else
-    return m[0] == rhs.m[0] && m[1] == rhs.m[1] && m[2] == rhs.m[2] && m[3] == rhs.m[3];
-#endif
-  }
-  bool operator!=(const Vec4& rhs) const { return !(*this == rhs); }
-};
-template <typename T>
-[[nodiscard]] Vec4<T> operator+(const Vec4<T>& a, const Vec4<T>& b) {
-#ifdef USE_GCC_VECTOR_EXTENSIONS
-  return a.m + b.m;
-#else
-  return {a.m[0] + b.m[0], a.m[1] + b.m[1], a.m[2] + b.m[2], a.m[3] + b.m[3]};
-#endif
-}
-template <typename T>
-[[nodiscard]] Vec4<T> operator*(const Vec4<T>& a, const Vec4<T>& b) {
-#ifdef USE_GCC_VECTOR_EXTENSIONS
-  return a.m * b.m;
-#else
-  return {a.m[0] * b.m[0], a.m[1] * b.m[1], a.m[2] * b.m[2], a.m[3] * b.m[3]};
-#endif
-}
-template <typename T>
-struct Mat3x2 {
-  Vec2<T> m0{};
-  Vec2<T> m1{};
-  Vec2<T> m2{};
-
-  constexpr Mat3x2() = default;
-  constexpr Mat3x2(const Vec2<T>& m0, const Vec2<T>& m1, const Vec2<T>& m2) : m0(m0), m1(m1), m2(m2) {}
-
-  bool operator==(const Mat3x2& rhs) const { return m0 == rhs.m0 && m1 == rhs.m1 && m2 == rhs.m2; }
-  bool operator!=(const Mat3x2& rhs) const { return !(*this == rhs); }
-};
-template <typename T>
-struct Mat4x2 {
-  Vec2<T> m0{};
-  Vec2<T> m1{};
-  Vec2<T> m2{};
-  Vec2<T> m3{};
-
-  constexpr Mat4x2() = default;
-  constexpr Mat4x2(const Vec2<T>& m0, const Vec2<T>& m1, const Vec2<T>& m2, const Vec2<T>& m3)
-  : m0(m0), m1(m1), m2(m2), m3(m3) {}
-
-  inline Mat4x2 transpose() const {
-    return {
-        {m0.x, m2.x},
-        {m0.y, m2.y},
-        {m1.x, m3.x},
-        {m1.y, m3.y},
-    };
-  }
-
-  bool operator==(const Mat4x2& rhs) const { return m0 == rhs.m0 && m1 == rhs.m1 && m2 == rhs.m2 && m3 == rhs.m3; }
-  bool operator!=(const Mat4x2& rhs) const { return !(*this == rhs); }
-};
-template <typename T>
-struct Mat2x4 {
-  Vec4<T> m0{};
-  Vec4<T> m1{};
-
-  constexpr Mat2x4() = default;
-  constexpr Mat2x4(const Vec4<T>& m0, const Vec4<T>& m1, const Vec4<T>& m2) : m0(m0), m1(m1) {}
-
-  bool operator==(const Mat2x4& rhs) const { return m0 == rhs.m0 && m1 == rhs.m1; }
-  bool operator!=(const Mat2x4& rhs) const { return !(*this == rhs); }
-};
-static_assert(sizeof(Mat2x4<float>) == 32);
-template <typename T>
-struct Mat4x4;
-template <typename T>
-struct Mat3x4 {
-  Vec4<T> m0{};
-  Vec4<T> m1{};
-  Vec4<T> m2{};
-
-  constexpr Mat3x4() = default;
-  constexpr Mat3x4(const Vec4<T>& m0, const Vec4<T>& m1, const Vec4<T>& m2) : m0(m0), m1(m1), m2(m2) {}
-
-  [[nodiscard]] Mat4x4<T> to4x4() const;
-  [[nodiscard]] Mat4x4<T> toTransposed4x4() const;
-
-  bool operator==(const Mat3x4& rhs) const { return m0 == rhs.m0 && m1 == rhs.m1 && m2 == rhs.m2; }
-  bool operator!=(const Mat3x4& rhs) const { return !(*this == rhs); }
-};
-static_assert(sizeof(Mat3x4<float>) == 48);
-template <typename T>
-struct Mat4x4 {
-  Vec4<T> m0{};
-  Vec4<T> m1{};
-  Vec4<T> m2{};
-  Vec4<T> m3{};
-
-  constexpr Mat4x4() = default;
-  constexpr Mat4x4(const Vec4<T>& m0, const Vec4<T>& m1, const Vec4<T>& m2, const Vec4<T>& m3)
-  : m0(m0), m1(m1), m2(m2), m3(m3) {}
-  AURORA_MAT4X4_EXTRA
-
-  [[nodiscard]] Mat4x4 transpose() const {
-    return {
-        {m0[0], m1[0], m2[0], m3[0]},
-        {m0[1], m1[1], m2[1], m3[1]},
-        {m0[2], m1[2], m2[2], m3[2]},
-        {m0[3], m1[3], m2[3], m3[3]},
-    };
-  }
-  Mat4x4& operator=(const Mat4x4& other) = default;
-
-  Vec4<T>& operator[](size_t i) { return *(&m0 + i); }
-  const Vec4<T>& operator[](size_t i) const { return *(&m0 + i); }
-
-  bool operator==(const Mat4x4& rhs) const { return m0 == rhs.m0 && m1 == rhs.m1 && m2 == rhs.m2 && m3 == rhs.m3; }
-  bool operator!=(const Mat4x4& rhs) const { return !(*this == rhs); }
-};
-static_assert(sizeof(Mat4x4<float>) == 64);
-template <typename T>
-[[nodiscard]] Mat4x4<T> operator*(const Mat4x4<T>& a, const Mat4x4<T>& b) {
-  Mat4x4<T> out;
-  for (size_t i = 0; i < 4; ++i) {
-    *(&out.m0 + i) = a.m0 * b[i].template shuffle<0, 0, 0, 0>() + a.m1 * b[i].template shuffle<1, 1, 1, 1>() +
-                     a.m2 * b[i].template shuffle<2, 2, 2, 2>() + a.m3 * b[i].template shuffle<3, 3, 3, 3>();
-  }
-  return out;
-}
-template <typename T>
-[[nodiscard]] Mat4x4<T> Mat3x4<T>::to4x4() const {
-  return {
-      {m0[0], m0[1], m0[2], 0.f},
-      {m1[0], m1[1], m1[2], 0.f},
-      {m2[0], m2[1], m2[2], 0.f},
-      {m0[3], m1[3], m2[3], 1.f},
-  };
-}
-template <typename T>
-[[nodiscard]] Mat4x4<T> Mat3x4<T>::toTransposed4x4() const {
-  return Mat4x4<T>{
-      {m0[0], m1[0], m2[0], 0.f},
-      {m0[1], m1[1], m2[1], 0.f},
-      {m0[2], m1[2], m2[2], 0.f},
-      {m0[3], m1[3], m2[3], 1.f},
-  };
-}
-constexpr Mat4x4 Mat4x4_Identity{
-    Vec4{1.f, 0.f, 0.f, 0.f},
-    Vec4{0.f, 1.f, 0.f, 0.f},
-    Vec4{0.f, 0.f, 1.f, 0.f},
-    Vec4{0.f, 0.f, 0.f, 1.f},
-};
-} // namespace aurora

aurora-main/include/aurora/render_size_limits.hpp

@@ -1,81 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <limits>
-
-namespace aurora::render_size_limits {
-
-struct Size {
-  uint32_t width;
-  uint32_t height;
-};
-
-// The canvas follows the window aspect however wide it gets, since the presenter stretches it and
-// a cap would distort the UI. Only the portrait side clamps, where the guest cannot fill taller.
-inline constexpr float kMaxDynamicPortraitExpansion = 6.f;
-inline constexpr float kMinDynamicAspect = (16.f / 9.f) / kMaxDynamicPortraitExpansion;
-
-// The adapter limit is an API ceiling, not an allocation budget: a 16384-wide RGBA attachment is
-// near 100 MiB. 8192 plus an 8K-UHD pixel budget keeps 8x 16:9 while avoiding device removal.
-inline constexpr uint32_t kMaxFramebufferDimension = 8192;
-inline constexpr uint64_t kMaxFramebufferPixels = 7680ull * 4320ull;
-
-inline float clamp_dynamic_aspect(float aspect) noexcept {
-  if (!std::isfinite(aspect) || aspect <= 0.f) {
-    return 1.f;
-  }
-  return std::max(aspect, kMinDynamicAspect);
-}
-
-inline Size scale_framebuffer_to_aspect(uint32_t width, uint32_t height, float scale, float requestedAspect) noexcept {
-  if (width == 0 || height == 0 || !std::isfinite(scale) || scale <= 0.f) {
-    return {std::max(width, 1u), std::max(height, 1u)};
-  }
-
-  const auto scaledWidth = std::max(1u, static_cast<uint32_t>(std::lround(static_cast<double>(width) * scale)));
-  const auto scaledHeight = std::max(1u, static_cast<uint32_t>(std::lround(static_cast<double>(height) * scale)));
-  const float aspect = clamp_dynamic_aspect(requestedAspect);
-  if (aspect >= static_cast<float>(width) / static_cast<float>(height)) {
-    return {
-        std::max(1u, static_cast<uint32_t>(std::lround(static_cast<double>(scaledHeight) * aspect))),
-        scaledHeight,
-    };
-  }
-  return {
-      scaledWidth,
-      std::max(1u, static_cast<uint32_t>(std::lround(static_cast<double>(scaledWidth) / aspect))),
-  };
-}
-
-inline Size fit_framebuffer_to_budget(uint32_t width, uint32_t height, uint32_t adapterMaxDimension) noexcept {
-  if (width == 0 || height == 0) {
-    return {width, height};
-  }
-
-  uint32_t dimensionLimit = kMaxFramebufferDimension;
-  if (adapterMaxDimension != 0 && adapterMaxDimension != std::numeric_limits<uint32_t>::max()) {
-    dimensionLimit = std::min(dimensionLimit, adapterMaxDimension);
-  }
-  dimensionLimit = std::max(dimensionLimit, 1u);
-
-  double fitScale = 1.0;
-  fitScale = std::min(fitScale, static_cast<double>(dimensionLimit) / static_cast<double>(width));
-  fitScale = std::min(fitScale, static_cast<double>(dimensionLimit) / static_cast<double>(height));
-
-  const double requestedPixels = static_cast<double>(width) * static_cast<double>(height);
-  if (requestedPixels > static_cast<double>(kMaxFramebufferPixels)) {
-    fitScale = std::min(fitScale, std::sqrt(static_cast<double>(kMaxFramebufferPixels) / requestedPixels));
-  }
-
-  if (fitScale >= 1.0) {
-    return {width, height};
-  }
-  return {
-      std::max(1u, static_cast<uint32_t>(std::floor(static_cast<double>(width) * fitScale))),
-      std::max(1u, static_cast<uint32_t>(std::floor(static_cast<double>(height) * fitScale))),
-  };
-}
-
-} // namespace aurora::render_size_limits

aurora-main/include/dolphin/ai.h

@@ -1,50 +0,0 @@
-#ifndef _DOLPHIN_AI_H_
-#define _DOLPHIN_AI_H_
-
-#include <dolphin/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*AISCallback)(u32 count);
-typedef void (*AIDCallback)();
-
-#define AI_STREAM_START 1
-#define AI_STREAM_STOP 0
-
-#define AI_SAMPLERATE_32KHZ  0
-#define AI_SAMPLERATE_48KHZ  1
-
-AIDCallback AIRegisterDMACallback(AIDCallback callback);
-void AIInitDMA(u32 start_addr, u32 length);
-BOOL AIGetDMAEnableFlag(void);
-void AIStartDMA(void);
-void AIStopDMA(void);
-u32 AIGetDMABytesLeft(void);
-u32 AIGetDMAStartAddr(void);
-u32 AIGetDMALength(void);
-BOOL AICheckInit(void);
-AISCallback AIRegisterStreamCallback(AISCallback callback);
-u32 AIGetStreamSampleCount(void);
-void AIResetStreamSampleCount(void);
-void AISetStreamTrigger(u32 trigger);
-u32 AIGetStreamTrigger(void);
-void AISetStreamPlayState(u32 state);
-u32 AIGetStreamPlayState(void);
-void AISetDSPSampleRate(u32 rate);
-u32 AIGetDSPSampleRate(void);
-void AISetStreamSampleRate(u32 rate);
-u32 AIGetStreamSampleRate(void);
-void AISetStreamVolLeft(u8 vol);
-u8 AIGetStreamVolLeft(void);
-void AISetStreamVolRight(u8 vol);
-u8 AIGetStreamVolRight(void);
-void AIInit(u8* stack);
-void AIReset(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/ar.h

@@ -1,79 +0,0 @@
-#ifndef _DOLPHIN_AR_H_
-#define _DOLPHIN_AR_H_
-
-#include <dolphin/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*ARQCallback)(uintptr_t pointerToARQRequest);
-
-struct ARQRequest {
-    /* 0x00 */ struct ARQRequest *next;
-    /* 0x04 */ u32 owner;
-    /* 0x08 */ u32 type;
-    /* 0x0C */ u32 priority;
-    /* 0x10 */ u32 source;
-    /* 0x14 */ u32 dest;
-    /* 0x18 */ u32 length;
-    /* 0x1C */ ARQCallback callback;
-};
-
-#define ARQ_DMA_ALIGNMENT 32
-
-#define ARAM_DIR_MRAM_TO_ARAM 0x00
-#define ARAM_DIR_ARAM_TO_MRAM 0x01
-
-#define ARStartDMARead(mmem, aram, len) \
-    ARStartDMA(ARAM_DIR_ARAM_TO_MRAM, mmem, aram, len)
-#define ARStartDMAWrite(mmem, aram, len) \
-    ARStartDMA(ARAM_DIR_MRAM_TO_ARAM, mmem, aram, len)
-
-typedef struct ARQRequest ARQRequest;
-
-#define ARQ_TYPE_MRAM_TO_ARAM ARAM_DIR_MRAM_TO_ARAM
-#define ARQ_TYPE_ARAM_TO_MRAM ARAM_DIR_ARAM_TO_MRAM
-
-#define ARQ_PRIORITY_LOW  0
-#define ARQ_PRIORITY_HIGH 1
-
-// AR
-ARQCallback ARRegisterDMACallback(ARQCallback callback);
-u32 ARGetDMAStatus(void);
-void ARStartDMA(u32 type, u32 mainmem_addr, u32 aram_addr, u32 length);
-u32 ARAlloc(u32 length);
-u32 ARFree(u32* length);
-BOOL ARCheckInit(void);
-u32 ARInit(u32* stack_index_addr, u32 num_entries);
-void ARReset(void);
-void ARSetSize(void);
-u32 ARGetBaseAddress(void);
-u32 ARGetSize(void);
-u32 ARGetInternalSize(void);
-void ARClear(u32 flag);
-
-/**
- * Aurora extension: gets the memory address where ARAM is stored, for direct access.
- */
-void* ARGetStorageAddress();
-
-// ARQ
-void ARQInit(void);
-void ARQReset(void);
-void ARQPostRequest(ARQRequest* request, u32 owner, u32 type, u32 priority, uintptr_t source, uintptr_t dest, u32 length, ARQCallback callback);
-void ARQRemoveRequest(ARQRequest* request);
-void ARQRemoveOwnerRequest(u32 owner);
-void ARQFlushQueue(void);
-void ARQSetChunkSize(u32 size);
-u32 ARQGetChunkSize(void);
-BOOL ARQCheckInit(void);
-
-u16 __ARGetInterruptStatus(void);
-void __ARClearInterrupt(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/base/PPCArch.h

@@ -1,542 +0,0 @@
-#ifndef _DOLPHIN_PPCARCH
-#define _DOLPHIN_PPCARCH
-
-#include <dolphin/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CTR     9
-#define XER     1
-#define LR      8
-
-#define UPMC1   937
-#define UPMC2   938
-#define UPMC3   941
-#define UPMC4   942
-
-#define USIA    939
-
-#define UMMCR0  936
-#define UMMCR1  940
-
-#define HID0    1008
-#define HID1    1009
-
-#define PVR     287
-
-#define IBAT0U  528
-#define IBAT0L  529
-#define IBAT1U  530
-#define IBAT1L  531
-#define IBAT2U  532
-#define IBAT2L  533
-#define IBAT3U  534
-#define IBAT3L  535
-
-#define DBAT0U  536
-#define DBAT0L  537
-#define DBAT1U  538
-#define DBAT1L  539
-#define DBAT2U  540
-#define DBAT2L  541
-#define DBAT3U  542
-#define DBAT3L  543
-
-#define SDR1    25
-
-#define SPRG0   272
-#define SPRG1   273
-#define SPRG2   274
-#define SPRG3   275
-
-#define DAR     19
-#define DSISR   18
-
-#define SRR0    26
-#define SRR1    27
-
-#define EAR     282
-
-#define DABR    1013
-
-#define TBL     284
-#define TBU     285
-
-#define L2CR    1017
-
-#define DEC     22
-
-#define IABR    1010
-
-#define PMC1    953
-#define PMC2    954
-#define PMC3    957
-#define PMC4    958
-
-#define SIA     955
-
-#define MMCR0   952
-#define MMCR1   956
-
-#define THRM1   1020
-#define THRM2   1021
-#define THRM3   1022
-
-#define ICTC    1019
-
-#define GQR0    912
-#define GQR1    913
-#define GQR2    914
-#define GQR3    915
-#define GQR4    916
-#define GQR5    917
-#define GQR6    918
-#define GQR7    919
-
-#define HID2    920
-
-#define WPAR    921
-
-#define DMA_U   922
-#define DMA_L   923
-
-#define MSR_POW         0x00040000  // Power Management
-#define MSR_ILE         0x00010000  // Interrupt Little Endian
-#define MSR_EE          0x00008000  // external interrupt
-#define MSR_PR          0x00004000  // privilege level(should be 0)
-#define MSR_FP          0x00002000  // floating point available
-#define MSR_ME          0x00001000  // machine check enable
-#define MSR_FE0         0x00000800  // floating point exception enable
-#define MSR_SE          0x00000400  // single step trace enable
-#define MSR_BE          0x00000200  // branch trace enable
-#define MSR_FE1         0x00000100  // floating point exception enable
-#define MSR_IP          0x00000040  // Exception prefix
-#define MSR_IR          0x00000020  // instruction relocate
-#define MSR_DR          0x00000010  // data relocate
-#define MSR_PM          0x00000004  // Performance monitor marked mode
-#define MSR_RI          0x00000002  // Recoverable interrupt
-#define MSR_LE          0x00000001  // Little Endian
-
-#define MSR_POW_BIT     13          // Power Management
-#define MSR_ILE_BIT     15          // Interrupt Little Endian
-#define MSR_EE_BIT      16          // external interrupt
-#define MSR_PR_BIT      17          // privilege level (should be 0)
-#define MSR_FP_BIT      18          // floating point available
-#define MSR_ME_BIT      19          // machine check enable
-#define MSR_FE0_BIT     20          // floating point exception enable
-#define MSR_SE_BIT      21          // single step trace enable
-#define MSR_BE_BIT      22          // branch trace enable
-#define MSR_FE1_BIT     23          // floating point exception enable
-#define MSR_IP_BIT      25          // Exception prefix
-#define MSR_IR_BIT      26          // instruction relocate
-#define MSR_DR_BIT      27          // data relocate
-#define MSR_PM_BIT      29          // Performance monitor marked mode
-#define MSR_RI_BIT      30          // Recoverable interrupt
-#define MSR_LE_BIT      31          // Little Endian
-
-/*---------------------------------------------------------------------------*
-    HID0 bits
- *---------------------------------------------------------------------------*/
-#define HID0_EMCP       0x80000000u  // Enable MCP
-#define HID0_DBP        0x40000000u  // Enable 60x bus address and data parity chk
-#define HID0_EBA        0x20000000u  // Enable 60x address parity checking
-#define HID0_EBD        0x10000000u  // Enable 60x data parity checking
-#define HID0_BCLK       0x08000000u  // CLK_OUT output enable and clk selection
-#define HID0_ECLK       0x02000000u  // CLK_OUT output enable and clk selection
-#define HID0_PAR        0x01000000u  // Disable !ARTRY precharge
-#define HID0_DOZE       0x00800000u  // Doze mode enable
-#define HID0_NAP        0x00400000u  // Nap mode enable
-#define HID0_SLEEP      0x00200000u  // Sleep mode enable
-#define HID0_DPM        0x00100000u  // Dynamic power management enable
-#define HID0_NHR        0x00010000u  // Not hard reset (0 hard reset if s/w set it)
-#define HID0_ICE        0x00008000u  // Instruction cache enable
-#define HID0_DCE        0x00004000u  // Data cache enable
-#define HID0_ILOCK      0x00002000u  // ICache lock
-#define HID0_DLOCK      0x00001000u  // DCache lock
-#define HID0_ICFI       0x00000800u  // ICache flash invalidate
-#define HID0_DCFI       0x00000400u  // DCache flash invalidate
-#define HID0_SPD        0x00000200u  // Speculative cache access enable (0 enable)
-#define HID0_IFEM       0x00000100u  // Enable M bit on bus for Ifetch
-#define HID0_SGE        0x00000080u  // Store gathering enable
-#define HID0_DCFA       0x00000040u  // DCache flush assist - set before a flush
-#define HID0_BTIC       0x00000020u  // Branch target icache enable
-#define HID0_ABE        0x00000008u  // Address bcast enable
-#define HID0_BHT        0x00000004u  // Branch history table enable
-#define HID0_NOOPTI     0x00000001u  // No-op Dcache touch instructions
-
-#define HID0_ICE_BIT    16          // Instruction cache enable
-#define HID0_DCE_BIT    17          // Data cache enable
-#define HID0_ILOCK_BIT  18          // ICache lock
-#define HID0_DLOCK_BIT  19          // DCache lock
-
-#define HID2_LSQE           0x80000000  // L/S quantize enable
-#define HID2_WPE            0x40000000  // Write pipe enable
-#define HID2_PSE            0x20000000  // Paired single enable
-#define HID2_LCE            0x10000000  // Locked cache enable
-
-#define HID2_DCHERR         0x00800000  // ERROR: dcbz_l cache hit
-#define HID2_DNCERR         0x00400000  // ERROR: DMA access to normal cache
-#define HID2_DCMERR         0x00200000  // ERROR: DMA cache miss error
-#define HID2_DQOERR         0x00100000  // ERROR: DMA queue overflow
-#define HID2_DCHEE          0x00080000  // dcbz_l cache hit error enable
-#define HID2_DNCEE          0x00040000  // DMA access to normal cache error enable
-#define HID2_DCMEE          0x00020000  // DMA cache miss error error enable
-#define HID2_DQOEE          0x00010000  // DMA queue overflow error enable
-
-#define HID2_DMAQL_MASK     0x0F000000  // DMA queue length mask
-#define HID2_DMAQL_SHIFT    24          // DMA queue shift
-
-#define HID2_LSQE_BIT       0
-#define HID2_WPE_BIT        1
-#define HID2_PSE_BIT        2
-#define HID2_LCE_BIT        3
-
-#define HID2_DCHERR_BIT     8
-#define HID2_DNCERR_BIT     9
-#define HID2_DCMERR_BIT     10
-#define HID2_DQOERR_BIT     11
-#define HID2_DCHEE_BIT      12
-#define HID2_DNCEE_BIT      13
-#define HID2_DCMEE_BIT      14
-#define HID2_DQOEE_BIT      15
-
-#define GQR_LOAD_SCALE_MASK         0x3F000000  // load scale field
-#define GQR_LOAD_TYPE_MASK          0x00070000  // load type field
-#define GQR_STORE_SCALE_MASK        0x00003F00  // store scale field
-#define GQR_STORE_TYPE_MASK         0x00000007  // store type field
-
-typedef struct
-{
-    u32 _pad0       :2;
-    u32 loadScale   :6;
-    u32 _pad1       :5;
-    u32 loadType    :3;
-    u32 _pad2       :2;
-    u32 storeScale  :6;
-    u32 _pad3       :5;
-    u32 storeType   :3;
-} PPC_GQR_t;
-
-typedef union
-{
-    u32         val;
-    PPC_GQR_t   f;
-} PPC_GQR_u;
-
-
-#define DMA_U_ADDR_MASK             0xFFFFFFE0  // Start addr in memory
-#define DMA_U_LEN_U_MASK            0x0000001F  // lines to transfer (U)
-
-#define DMA_L_LC_ADDR_MASK          0xFFFFFFE0  // Start addr in LC
-#define DMA_L_LOAD                  0x00000010  // 0 - store, 1 - load
-#define DMA_L_STORE                 0x00000000  // 0 - store, 1 - load
-#define DMA_L_LEN_MASK              0x0000000C  // lines to transfer (L)
-#define DMA_L_TRIGGER               0x00000002  // 0 - cmd inactive, 1 - cmd rdy
-#define DMA_L_FLUSH                 0x00000001  // 1 - Flush DMA queue
-
-typedef struct
-{
-    u32 memAddr     :27;
-    u32 dmaLenU     :5;
-} PPC_DMA_U_t;
-
-typedef union
-{
-    u32             val;
-    PPC_DMA_U_t     f;
-} PPC_DMA_U_u;
-
-
-typedef struct
-{
-    u32 lcAddr      :27;
-    u32 dmaLd       :1;
-    u32 dmaLenL     :2;
-    u32 dmaTrigger  :1;
-    u32 dmaFlush    :1;
-} PPC_DMA_L_t;
-
-
-typedef union
-{
-    u32             val;
-    PPC_DMA_L_t     f;
-} PPC_DMA_L_u;
-
-
-#define WPAR_ADDR                   0xFFFFFFE0  // 32byte gather address
-#define WPAR_BNE                    0x00000001  // Buffer not empty (R)
-
-#define SRR1_DMA_BIT                0x00200000
-#define SRR1_L2DP_BIT               0x00100000
-
-#define L2CR_L2E                    0x80000000  // L2 Enable
-#define L2CR_L2PE                   0x40000000  // L2 data parity generation and checking enable
-
-#define L2CR_L2SIZ_256K             0x10000000  // L2 size 256K
-#define L2CR_L2SIZ_512K             0x20000000  // L2 size 512
-#define L2CR_L2SIZ_1M               0x30000000  // L2 size 1M
-
-#define L2CR_L2CLK_1_0              0x02000000  // L2 clock ratio 1
-#define L2CR_L2CLK_1_5              0x04000000  // L2 clock ratio 1.5
-#define L2CR_L2CLK_2_0              0x08000000  // L2 clock ratio 2
-#define L2CR_L2CLK_2_5              0x0A000000  // L2 clock ratio 2.5
-#define L2CR_L2CLK_3_0              0x0C000000  // L2 clock ratio 3
-
-#define L2CR_RAM_FLOW_THRU_BURST    0x00000000  // L2 RAM type flow-through sync. burst SRAM
-#define L2CR_RAM_PIPELINE_BURST     0x01000000  // L2 RAM type pipelined sync. burst SRAM
-#define L2CR_RAM_PIPELINE_LATE      0x01800000  // L2 RAM type pipelined sync. late-write SRAM
-
-#define L2CR_L2DO                   0x00400000  // Data only
-#define L2CR_L2I                    0x00200000  // Global invalidate
-#define L2CR_L2CTL                  0x00100000  // ZZ enable
-#define L2CR_L2WT                   0x00080000  // L2 write through
-#define L2CR_L2TS                   0x00040000  // L2 test support
-
-#define L2CR_L2OH_0_5               0x00000000  // L2 output hold 0.5 ns
-#define L2CR_L2OH_1_0               0x00010000  // L2 output hold 1.0 ns
-
-#define L2CR_L2SL                   0x00008000  // L2 DLL slow
-#define L2CR_L2DF                   0x00004000  // L2 differential clock
-#define L2CR_L2BYP                  0x00002000  // L2 DLL bypass
-#define L2CR_L2CS                   0x00000200  // L2 clock stop
-#define L2CR_L2DRO                  0x00000100  // L2 DLL rollover checkstop enable
-#define L2CR_L2CTR_MASK             0x000000FE  // L2 counter value mask
-#define L2CR_L2IP                   0x00000001  // L2 global invalidate in progress
-
-#define MMCR0_DIS                   0x80000000  // Disables counting unconditionally
-#define MMCR0_DP                    0x40000000  // Disables counting while in supervisor mode
-#define MMCR0_DU                    0x20000000  // Disables counting while in user mode
-#define MMCR0_DMS                   0x10000000  // Disables counting while MSR[PM] is set
-#define MMCR0_DMR                   0x08000000  // Disables counting while MSR[PM] is zero
-#define MMCR0_ENINT                 0x04000000  // Enables performance monitor interrupt signaling
-#define MMCR0_DISCOUNT              0x02000000  // Disables counting of PMCn when a performance monitor interrupt is signaled or...
-#define MMCR0_RTCSELECT_MASK        0x01800000  // 64-bit time base, bit selection enable
-#define MMCR0_RTCSELECT_63          0x00000000  // Pick bit 63 to count
-#define MMCR0_RTCSELECT_55          0x00800000  // Pick bit 55 to count
-#define MMCR0_RTCSELECT_51          0x01000000  // Pick bit 51 to count
-#define MMCR0_RTCSELECT_47          0x01800000  // Pick bit 47 to count
-#define MMCR0_INTONBITTRANS         0x00400000  // Causes interrupt signaling on bit transition from off to on
-#define MMCR0_THRESHOLD_MASK        0x003F0000  // Threshold value
-#define MMCR0_THRESHOLD(n)          ((n) << 16) // Threshold value (0 - 63)
-#define MMCR0_PMC1INTCONTROL        0x00008000  // Enables interrupt signaling due to PMC1 counter overflow
-#define MMCR0_PMC2INTCONTROL        0x00004000  // Enables interrupt signaling due to PMC2-PMC4 counter overflow
-#define MMCR0_PMCTRIGGER            0x00002000  // Can be used to trigger counting of PMC2-PMC4 after PMC1 has overflowed or...
-#define MMCR0_PMC1SELECT_MASK       0x00001FC0  // PMC1 input selector
-#define MMCR0_PMC2SELECT_MASK       0x0000003F  // PMC2 input selector
-
-#define MMCR1_PMC3SELECT_MASK       0xF8000000  // PMC3 input selector
-#define MMCR1_PMC4SELECT_MASK       0x07C00000  // PMC4 input selector
-
-#define PMC1_OV                     0x80000000  // Overflow
-#define PMC1_COUNTER                0x7FFFFFFF  // Counter value
-#define PMC2_OV                     0x80000000  // Overflow
-#define PMC2_COUNTER                0x7FFFFFFF  // Counter value
-#define PMC3_OV                     0x80000000  // Overflow
-#define PMC3_COUNTER                0x7FFFFFFF  // Counter value
-#define PMC4_OV                     0x80000000  // Overflow
-#define PMC4_COUNTER                0x7FFFFFFF  // Counter value
-
-/*---------------------------------------------------------------------------*
-    PMC1 Events
- *---------------------------------------------------------------------------*/
-#define MMCR0_PMC1_HOLD             0x00000000  // Register holds current value
-#define MMCR0_PMC1_CYCLE            0x00000040  // Processor cycles
-#define MMCR0_PMC1_INSTRUCTION      0x00000080  // # of instructions completed.
-#define MMCR0_PMC1_TRANSITION       0x000000C0  // # of transitions for 0 to 1
-#define MMCR0_PMC1_DISPATCHED       0x00000100  // # of instructions dispatched
-#define MMCR0_PMC1_EIEIO            0x00000140  // # of eieio instructions completed
-#define MMCR0_PMC1_ITLB_CYCLE       0x00000180  // # of cycles spent performing table search op. for the ITLB
-#define MMCR0_PMC1_L2_HIT           0x000001C0  // # of access that hit the L2.
-#define MMCR0_PMC1_EA               0x00000200  // # of valid instruction EAs delivered to the memory subsystem
-#define MMCR0_PMC1_IABR             0x00000240  // # of time the address of an instruction matches the IABR
-#define MMCR0_PMC1_L1_MISS          0x00000280  // # of loads that miss the L1
-#define MMCR0_PMC1_Bx_UNRESOLVED    0x000002C0  // # of branches that are unresolved when processed
-#define MMCR0_PMC1_Bx_STALL_CYCLE   0x00000300  // # of cycles that dispatcher stalls due to a second
-                                                //      unresolved branch in the instruction stream
-#define MMCR0_PMC1_IC_FETCH_MISS    0x00000340  // # of times an instruction fetch missed the L1 Icache
-#define MMCR0_PMC2_HOLD             0x00000000  // Register holds current value
-#define MMCR0_PMC2_CYCLE            0x00000001  // Processor cycles
-#define MMCR0_PMC2_INSTRUCTION      0x00000002  // # of instructions completed
-#define MMCR0_PMC2_TRANSITION       0x00000003  // # of time-base (lower) bit transitions
-#define MMCR0_PMC2_DISPATCHED       0x00000004  // # of instructions dispatched
-#define MMCR0_PMC2_IC_MISS          0x00000005  // # of L1 instruction cache misses
-#define MMCR0_PMC2_ITLB_MISS        0x00000006  // # of ITLB misses
-#define MMCR0_PMC2_L2_I_MISS        0x00000007  // # of L2 instruction misses
-#define MMCR0_PMC2_Bx_FALL_TROUGH   0x00000008  // # of fall-through branches
-#define MMCR0_PMC2_PR_SWITCH        0x00000009  // # of MSR[PR] bit toggles
-#define MMCR0_PMC2_RESERVED_LOAD    0x0000000A  // # of reserved loads completed
-#define MMCR0_PMC2_LOAD_STORE       0x0000000B  // # of completed loads and stores
-#define MMCR0_PMC2_SNOOP            0x0000000C  // # of snoops
-#define MMCR0_PMC2_L1_CASTOUT       0x0000000D  // # of L1 castouts to L2
-#define MMCR0_PMC2_SYSTEM           0x0000000E  // # of completed system unit instructions
-#define MMCR0_PMC2_IC_FETCH_MISS    0x0000000F  // # of instruction fetch misses in the L1
-#define MMCR0_PMC2_Bx_OUT_OF_ORDER  0x00000010  // # of branches allowing out-of-order execution
-
-/*---------------------------------------------------------------------------*
-    PMC3 Events
- *---------------------------------------------------------------------------*/
-#define MMCR1_PMC3_HOLD             0x00000000  // Register holds current value
-#define MMCR1_PMC3_CYCLE            0x08000000  // Processor cycles
-#define MMCR1_PMC3_INSTRUCTION      0x10000000  // # of instructions completed
-#define MMCR1_PMC3_TRANSITION       0x18000000  // # of time-base (lower) bit transitions
-#define MMCR1_PMC3_DISPATCHED       0x20000000  // # of instructions dispatched
-#define MMCR1_PMC3_DC_MISS          0x28000000  // # of L1 data cache misses
-#define MMCR1_PMC3_DTLB_MISS        0x30000000  // # of DTLB misses
-#define MMCR1_PMC3_L2_D_MISS        0x38000000  // # of L2 data misses
-#define MMCR1_PMC3_Bx_TAKEN         0x40000000  // # predicted branches that were taken
-#define MMCR1_PMC3_PM_SWITCH        0x48000000  // # of transitions between marked and unmarked processes
-#define MMCR1_PMC3_COND_STORE       0x50000000  // # of store conditional instructions completed
-#define MMCR1_PMC3_FPU              0x58000000  // # of instructions completed from the FPU
-#define MMCR1_PMC3_L2_SNOOP_CASTOUT 0x60000000  // # of L2 castout caused by snoops to modified lines
-#define MMCR1_PMC3_L2_HIT           0x68000000  // # of cache operations that hit in the L2 cache
-#define MMCR1_PMC3_L1_MISS_CYCLE    0x78000000  // # of cycles generated by L1 load misses
-#define MMCR1_PMC3_Bx_SECOND        0x80000000  // # of branches in the second speculative branch
-                                                //   resolved correctly
-#define MMCR1_PMC3_BPU_LR_CR        0x88000000  // # of cycles the BPU stalls due to LR or CR unresolved
-                                                //   dependencies
-
-#define MMCR1_PMC4_HOLD             0x00000000  // Register holds current value
-#define MMCR1_PMC4_CYCLE            0x00400000  // Processor cycles
-#define MMCR1_PMC4_INSTRUCTION      0x00800000  // # of instructions completed
-#define MMCR1_PMC4_TRANSITION       0x00C00000  // # of time-base (lower) bit transitions
-#define MMCR1_PMC4_DISPATCHED       0x01000000  // # of instructions dispatched
-#define MMCR1_PMC4_L2_CASTOUT       0x01400000  // # of L2 castouts
-#define MMCR1_PMC4_DTLB_CYCLE       0x01800000  // # of cycles spent performing table searches for DTLB accesses
-#define MMCR1_PMC4_Bx_MISSED        0x02000000  // # of mispredicted branches
-#define MMCR1_PMC4_COND_STORE_INT   0x02800000  // # of store conditional instructions completed
-                                                //   with reservation intact
-#define MMCR1_PMC4_SYNC             0x02C00000  // # of completed sync instructions
-#define MMCR1_PMC4_SNOOP_RETRY      0x03000000  // # of snoop request retries
-#define MMCR1_PMC4_INTEGER          0x03400000  // # of completed integer operations
-#define MMCR1_PMC4_BPU_THIRD        0x03800000  // # of cycles the BPU cannot process new branches
-                                                //   due to having two unresolved branches
-#define MMCR1_PMC4_DC_MISS          0x07C00000  // # of L1 data cache misses
-
-/*---------------------------------------------------------------------------*
-    FPSCR bits
- *---------------------------------------------------------------------------*/
-#ifndef FPSCR_FX
-#define FPSCR_FX            0x80000000  // Exception summary
-#define FPSCR_FEX           0x40000000  // Enabled exception summary
-#define FPSCR_VX            0x20000000  // Invalid operation
-#define FPSCR_OX            0x10000000  // Overflow exception
-#define FPSCR_UX            0x08000000  // Underflow exception
-#define FPSCR_ZX            0x04000000  // Zero divide exception
-#define FPSCR_XX            0x02000000  // Inexact exception
-#define FPSCR_VXSNAN        0x01000000  // SNaN
-#define FPSCR_VXISI         0x00800000  // Infinity - Infinity
-#define FPSCR_VXIDI         0x00400000  // Infinity / Infinity
-#define FPSCR_VXZDZ         0x00200000  // 0 / 0
-#define FPSCR_VXIMZ         0x00100000  // Infinity * 0
-#define FPSCR_VXVC          0x00080000  // Invalid compare
-#define FPSCR_FR            0x00040000  // Fraction rounded
-#define FPSCR_FI            0x00020000  // Fraction inexact
-#define FPSCR_VXSOFT        0x00000400  // Software request
-#define FPSCR_VXSQRT        0x00000200  // Invalid square root
-#define FPSCR_VXCVI         0x00000100  // Invalid integer convert
-#define FPSCR_VE            0x00000080  // Invalid operation exception enable
-#define FPSCR_OE            0x00000040  // Overflow exception enable
-#define FPSCR_UE            0x00000020  // Underflow exception enable
-#define FPSCR_ZE            0x00000010  // Zero divide exception enable
-#define FPSCR_XE            0x00000008  // Inexact exception enable
-#define FPSCR_NI            0x00000004  // Non-IEEE mode
-#endif
-
-#ifndef FPSCR_FX_BIT
-#define FPSCR_FX_BIT        0           // Exception summary
-#define FPSCR_FEX_BIT       1           // Enabled exception summary
-#define FPSCR_VX_BIT        2           // Invalid operation
-#define FPSCR_OX_BIT        3           // Overflow exception
-#define FPSCR_UX_BIT        4           // Underflow exception
-#define FPSCR_ZX_BIT        5           // Zero divide exception
-#define FPSCR_XX_BIT        6           // Inexact exception
-#define FPSCR_VXSNAN_BIT    7           // SNaN
-#define FPSCR_VXISI_BIT     8           // Infinity - Infinity
-#define FPSCR_VXIDI_BIT     9           // Infinity / Infinity
-#define FPSCR_VXZDZ_BIT     10          // 0 / 0
-#define FPSCR_VXIMZ_BIT     11          // Infinity * 0
-#define FPSCR_VXVC_BIT      12          // Invalid compare
-#define FPSCR_FR_BIT        13          // Fraction rounded
-#define FPSCR_FI_BIT        14          // Fraction inexact
-#define FPSCR_VXSOFT_BIT    21          // Software request
-#define FPSCR_VXSQRT_BIT    22          // Invalid square root
-#define FPSCR_VXCVI_BIT     23          // Invalid integer convert
-#define FPSCR_VE_BIT        24          // Invalid operation exception enable
-#define FPSCR_OE_BIT        25          // Overflow exception enable
-#define FPSCR_UE_BIT        26          // Underflow exception enable
-#define FPSCR_ZE_BIT        27          // Zero divide exception enable
-#define FPSCR_XE_BIT        28          // Inexact exception enable
-#define FPSCR_NI_BIT        29          // Non-IEEE mode
-#endif
-
-union FpscrUnion {
-    f64 f;
-    struct {
-        u32 fpscr_pad;
-        u32 fpscr;
-    } u;
-};
-
-// PPCArch
-u32 PPCMfmsr();
-void PPCMtmsr(u32 newMSR);
-u32 PPCOrMsr(u32 value);
-u32 PPCMfhid0();
-void PPCMthid0(u32 newHID0);
-u32 PPCMfl2cr();
-void PPCMtl2cr(u32 newL2cr);
-void PPCMtdec(u32 newDec);
-void PPCSync();
-void PPCHalt();
-u32 PPCMffpscr();
-void PPCMtfpscr(u32 newFPSCR);
-u32 PPCMfhid2();
-void PPCMthid2(u32 newhid2);
-u32 PPCMfwpar();
-void PPCMtwpar(u32 newwpar);
-void PPCEnableSpeculation();
-void PPCDisableSpeculation();
-void PPCSetFpIEEEMode();
-void PPCSetFpNonIEEEMode();
-u32 PPCMfpmc4();
-u32 PPCMfpmc3();
-u32 PPCMfpmc1();
-void PPCMtpmc1(u32 newPmc1);
-void PPCMtpmc2(u32 newPmc1);
-void PPCMtpmc3(u32 newPmc1);
-void PPCMtpmc4(u32 newPmc1);
-void PPCMtmmcr0(u32 newMmcr0);
-void PPCMtmmcr1(u32 newMmcr0);
-void PPCMtdmaU(u32 newdmau);
-void PPCMtdmaL(u32 newdmal);
-u32 PPCMfdec(void);
-u32 PPCMfpmc2(void);
-u32 PPCAndMsr(u32 value);
-u32 PPCAndCMsr(u32 value);
-u32 PPCMfhid1();
-void PPCEieio();
-u32 PPCMfmmcr0();
-u32 PPCMfmmcr1();
-u32 PPCMfpmc2();
-u32 PPCMfsia();
-void PPCMtsia(u32 newSia);
-u32 PPCMfdmaL();
-u32 PPCMfpvr();
-u32 PPCMfdmaU();
-
-// PPCPm
-void PMBegin(void);
-void PMEnd(void);
-void PMCycles(void);
-void PML1FetchMisses(void);
-void PML1MissCycles(void);
-void PMInstructions(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _DOLPHIN_PPCARCH

aurora-main/include/dolphin/card.h

@@ -1,340 +0,0 @@
-#ifndef _DOLPHIN_CARD_H_
-#define _DOLPHIN_CARD_H_
-
-#include <dolphin/os.h>
-#include <dolphin/dsp.h>
-#include <dolphin/dvd.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CARD_FILENAME_MAX 32
-#define CARD_MAX_FILE 127
-#define CARD_ICON_MAX 8
-
-#if TARGET_PC
-
-typedef enum {
-  CARD_RAWIMAGE,
-  CARD_GCIFOLDER,
-} CARDFileType;
-
-#endif
-
-typedef void (*CARDCallback)(s32 chan, s32 result);
-
-typedef struct CARDFileInfo {
-    s32 chan;
-    s32 fileNo;
-    s32 offset;
-    s32 length;
-    u16 iBlock;
-} CARDFileInfo;
-
-typedef struct CARDDir {
-    u8 gameName[4];
-    u8 company[2];
-    u8 _padding0;
-    u8 bannerFormat;
-    u8 fileName[CARD_FILENAME_MAX];
-    u32 time;     // seconds since 01/01/2000 midnight
-    u32 iconAddr; // 0xffffffff if not used
-    u16 iconFormat;
-    u16 iconSpeed;
-    u8 permission;
-    u8 copyTimes;
-    u16 startBlock;
-    u16 length;
-    u8 _padding1[2];
-    u32 commentAddr; // 0xffffffff if not used
-} CARDDir;
-
-typedef struct CARDControl {
-    /* 0x000 */ BOOL attached;
-    /* 0x004 */ s32 result;
-    /* 0x008 */ u16 size;
-    /* 0x00A */ u16 pageSize;
-    /* 0x00C */ s32 sectorSize;
-    /* 0x010 */ u16 cBlock;
-    /* 0x012 */ u16 vendorID;
-    /* 0x014 */ s32 latency;
-    /* 0x018 */ u8 id[12];
-    /* 0x024 */ int mountStep;
-    /* 0x028 */ int formatStep;
-    /* 0x028 */ u32 scramble;
-    /* 0x02C */ DSPTaskInfo task;
-    /* 0x080 */ void* workArea;
-    /* 0x084 */ CARDDir *currentDir;
-    /* 0x088 */ u16* currentFat;
-    /* 0x08C */ OSThreadQueue threadQueue;
-    /* 0x094 */ u8 cmd[9];
-    /* 0x0A0 */ s32 cmdlen;
-    /* 0x0A4 */ volatile u32 mode;
-    /* 0x0A8 */ int retry;
-    /* 0x0AC */ int repeat;
-    /* 0x0B0 */ u32 addr;
-    /* 0x0B4 */ void* buffer;
-    /* 0x0B8 */ s32 xferred;
-    /* 0x0BC */ u16 freeNo;
-    /* 0x0BE */ u16 startBlock;
-    /* 0x0C0 */ CARDFileInfo* fileInfo;
-    /* 0x0C4 */ CARDCallback extCallback;
-    /* 0x0C8 */ CARDCallback txCallback;
-    /* 0x0CC */ CARDCallback exiCallback;
-    /* 0x0D0 */ CARDCallback apiCallback;
-    /* 0x0D4 */ CARDCallback xferCallback;
-    /* 0x0D8 */ CARDCallback eraseCallback;
-    /* 0x0DC */ CARDCallback unlockCallback;
-    /* 0x0E0 */ OSAlarm alarm;
-    /* 0x108 */ u32 cid;
-    /* 0x10C */ const DVDDiskID* diskID;
-} CARDControl;
-
-typedef struct CARDDecParam {
-    /* 0x00 */ u8* inputAddr;
-    /* 0x04 */ u32 inputLength;
-    /* 0x08 */ u32 aramAddr;
-    /* 0x0C */ u8* outputAddr;
-} CARDDecParam;
-
-typedef struct CARDID {
-    /* 0x000 */ u8 serial[32];
-    /* 0x020 */ u16 deviceID;
-    /* 0x022 */ u16 size;
-    /* 0x024 */ u16 encode;
-    /* 0x026 */ u8 padding[470];
-    /* 0x1FC */ u16 checkSum;
-    /* 0x1FE */ u16 checkSumInv;
-} CARDID;
-
-typedef struct CARDDirCheck {
-    /* 0x00 */ u8 padding0[56];
-    /* 0x38 */ u16 padding1;
-    /* 0x3A */ s16 checkCode;
-    /* 0x3C */ u16 checkSum;
-    /* 0x3E */ u16 checkSumInv;
-} CARDDirCheck;
-
-typedef struct CARDStat {
-    /* 0x00 */ char fileName[CARD_FILENAME_MAX];
-    /* 0x20 */ u32 length;
-    /* 0x24 */ u32 time;
-    /* 0x28 */ u8 gameName[4];
-    /* 0x2C */ u8 company[2];
-    /* 0x2E */ u8 bannerFormat;
-    /* 0x30 */ u32 iconAddr;
-    /* 0x34 */ u16 iconFormat;
-    /* 0x36 */ u16 iconSpeed;
-    /* 0x38 */ u32 commentAddr;
-    /* 0x3C */ u32 offsetBanner;
-    /* 0x40 */ u32 offsetBannerTlut;
-    /* 0x44 */ u32 offsetIcon[CARD_ICON_MAX];
-    /* 0x64 */ u32 offsetIconTlut;
-    /* 0x68 */ u32 offsetData;
-} CARDStat;
-
-#define CARD_ATTR_PUBLIC  0x04u
-#define CARD_ATTR_NO_COPY 0x08u
-#define CARD_ATTR_NO_MOVE 0x10u
-#define CARD_ATTR_GLOBAL  0x20u
-#define CARD_ATTR_COMPANY 0x40u
-
-#define CARD_FAT_AVAIL 0x0000u
-#define CARD_FAT_CHECKSUM 0x0000u
-#define CARD_FAT_CHECKSUMINV 0x0001u
-#define CARD_FAT_CHECKCODE 0x0002u
-#define CARD_FAT_FREEBLOCKS 0x0003u
-#define CARD_FAT_LASTSLOT 0x0004u
-
-#define CARD_WORKAREA_SIZE (5 * 8 * 1024)
-
-#define CARD_SEG_SIZE 0x200u
-#define CARD_PAGE_SIZE 0x80u
-#define CARD_MAX_SIZE 0x01000000U
-
-#define CARD_NUM_SYSTEM_BLOCK 5
-#define CARD_SYSTEM_BLOCK_SIZE (8 * 1024u)
-
-#define CARD_MAX_MOUNT_STEP (CARD_NUM_SYSTEM_BLOCK + 2)
-
-#define CARD_STAT_SPEED_END 0
-#define CARD_STAT_SPEED_FAST 1
-#define CARD_STAT_SPEED_MIDDLE 2
-#define CARD_STAT_SPEED_SLOW 3
-#define CARD_STAT_SPEED_MASK 3
-
-#define CARD_STAT_ANIM_LOOP   0
-#define CARD_STAT_ANIM_BOUNCE 4
-#define CARD_STAT_ANIM_MASK 0x4
-
-#define CARD_RESULT_UNLOCKED       1
-#define CARD_RESULT_READY          0
-#define CARD_RESULT_BUSY          -1
-#define CARD_RESULT_WRONGDEVICE   -2
-#define CARD_RESULT_NOCARD        -3
-#define CARD_RESULT_NOFILE        -4
-#define CARD_RESULT_IOERROR       -5
-#define CARD_RESULT_BROKEN        -6
-#define CARD_RESULT_EXIST         -7
-#define CARD_RESULT_NOENT         -8
-#define CARD_RESULT_INSSPACE      -9
-#define CARD_RESULT_NOPERM       -10
-#define CARD_RESULT_LIMIT        -11
-#define CARD_RESULT_NAMETOOLONG  -12
-#define CARD_RESULT_ENCODING     -13
-#define CARD_RESULT_CANCELED     -14
-#define CARD_RESULT_FATAL_ERROR -128
-
-#define CARDIsValidBlockNo(card, blockNo) ((blockNo) >= CARD_NUM_SYSTEM_BLOCK && (blockNo) < (card)->cBlock)
-
-#define CARD_READ_SIZE 512
-
-#define CARD_COMMENT_SIZE 64
-
-#define CARD_ICON_WIDTH 32
-#define CARD_ICON_HEIGHT 32
-
-#define CARD_BANNER_WIDTH 96
-#define CARD_BANNER_HEIGHT 32
-
-#define CARD_STAT_ICON_NONE 0
-#define CARD_STAT_ICON_C8 1
-#define CARD_STAT_ICON_RGB5A3 2
-#define CARD_STAT_ICON_MASK 3
-
-#define CARD_STAT_BANNER_NONE 0
-#define CARD_STAT_BANNER_C8 1
-#define CARD_STAT_BANNER_RGB5A3 2
-#define CARD_STAT_BANNER_MASK 3
-
-#define CARD_ENCODE_ANSI 0
-#define CARD_ENCODE_SJIS 1
-
-#define CARDGetDirCheck(dir) ((CARDDirCheck*)&(dir)[CARD_MAX_FILE])
-#define CARDGetBannerFormat(stat) (((stat)->bannerFormat) & CARD_STAT_BANNER_MASK)
-#define CARDGetIconAnim(stat) (((stat)->bannerFormat) & CARD_STAT_ANIM_MASK)
-#define CARDGetIconFormat(stat, n) (((stat)->iconFormat >> (2 * (n))) & CARD_STAT_ICON_MASK)
-#define CARDGetIconSpeed(stat, n) (((stat)->iconSpeed >> (2 * (n))) & CARD_STAT_SPEED_MASK)
-#define CARDSetBannerFormat(stat, f)                                                               \
-    ((stat)->bannerFormat = (u8)(((stat)->bannerFormat & ~CARD_STAT_BANNER_MASK) | (f)))
-#define CARDSetIconAnim(stat, f)                                                                   \
-    ((stat)->bannerFormat = (u8)(((stat)->bannerFormat & ~CARD_STAT_ANIM_MASK) | (f)))
-#define CARDSetIconFormat(stat, n, f)                                                              \
-    ((stat)->iconFormat =                                                                            \
-        (u16)(((stat)->iconFormat & ~(CARD_STAT_ICON_MASK << (2 * (n)))) | ((f) << (2 * (n)))))
-#define CARDSetIconSpeed(stat, n, f)                                                               \
-    ((stat)->iconSpeed =                                                                             \
-        (u16)(((stat)->iconSpeed & ~(CARD_STAT_SPEED_MASK << (2 * (n)))) | ((f) << (2 * (n)))))
-#define CARDSetIconAddress(stat, addr) ((stat)->iconAddr = (u32)(addr))
-#define CARDSetCommentAddress(stat, addr) ((stat)->commentAddr = (u32)(addr))
-#define CARDGetFileNo(fileInfo) ((fileInfo)->fileNo)
-
-extern u32 __CARDFreq;
-
-#if DEBUG
-#define CARDFreq __CARDFreq
-#else
-#define CARDFreq EXI_FREQ_16M
-#endif
-
-s32 CARDRenameAsync(s32 chan, const char* oldName, const char* newName, CARDCallback callback);
-
-// CARDBios
-#if TARGET_PC
-void CARDInit(const char* game, const char* maker);
-void CARDSetGameAndMaker(const s32 chan, const char* game, const char* maker);
-
-// pass -1 to set both
-void CARDDetectDolphin(s32 chan);
-// pass -1 to set both
-void CARDSetBasePath(const char*, s32 chan);
-void CARDSetLoadType(CARDFileType type);
-
-#else
-void CARDInit(void);
-#endif
-s32 CARDGetResultCode(s32 chan);
-s32 CARDFreeBlocks(s32 chan, s32* byteNotUsed, s32* filesNotUsed);
-s32 CARDGetEncoding(s32 chan, u16* encode);
-s32 CARDGetMemSize(s32 chan, u16* size);
-s32 CARDGetSectorSize(s32 chan, u32* size);
-const DVDDiskID* CARDGetDiskID(s32 chan);
-s32 CARDSetDiskID(s32 chan, const DVDDiskID* diskID);
-BOOL CARDSetFastMode(BOOL enable);
-BOOL CARDGetFastMode(void);
-s32 CARDGetCurrentMode(s32 chan, u32* mode);
-
-// CARDCheck
-s32 CARDCheckExAsync(s32 chan, s32* xferBytes, CARDCallback callback);
-s32 CARDCheckAsync(s32 chan, CARDCallback callback);
-s32 CARDCheckEx(s32 chan, s32* xferBytes);
-s32 CARDCheck(s32 chan);
-
-// CARDCreate
-s32 CARDCreateAsync(s32 chan, const char* fileName, u32 size, CARDFileInfo* fileInfo, CARDCallback callback);
-s32 CARDCreate(s32 chan, const char* fileName, u32 size, CARDFileInfo* fileInfo);
-
-// CARDDelete
-s32 CARDFastDeleteAsync(s32 chan, s32 fileNo, CARDCallback callback);
-s32 CARDFastDelete(s32 chan, s32 fileNo);
-s32 CARDDeleteAsync(s32 chan, const char* fileName, CARDCallback callback);
-s32 CARDDelete(s32 chan, const char* fileName);
-
-// CARDErase
-s32 CARDEraseAsync(CARDFileInfo* fileInfo, s32 length, s32 offset, CARDCallback callback);
-s32 CARDErase(CARDFileInfo* fileInfo, s32 length, s32 offset);
-
-// CARDFormat
-s32 CARDFormat(s32 chan);
-
-// CARDMount
-int CARDProbe(s32 chan);
-s32 CARDProbeEx(s32 chan, s32* memSize, s32* sectorSize);
-s32 CARDMountAsync(s32 chan, void* workArea, CARDCallback detachCallback, CARDCallback attachCallback);
-s32 CARDMount(s32 chan, void* workArea, CARDCallback detachCallback);
-s32 CARDUnmount(s32 chan);
-
-// CARDNet
-u16 CARDSetVendorID(u16 vendorID);
-u16 CARDGetVendorID();
-s32 CARDGetSerialNo(s32 chan, u64* serialNo);
-s32 CARDGetUniqueCode(s32 chan, u64* uniqueCode);
-s32 CARDGetAttributes(s32 chan, s32 fileNo, u8* attr);
-s32 CARDSetAttributesAsync(s32 chan, s32 fileNo, u8 attr, CARDCallback callback);
-s32 CARDSetAttributes(s32 chan, s32 fileNo, u8 attr);
-
-// CARDOpen
-s32 CARDFastOpen(s32 chan, s32 fileNo, CARDFileInfo* fileInfo);
-s32 CARDOpen(s32 chan, const char* fileName, CARDFileInfo* fileInfo);
-s32 CARDClose(CARDFileInfo* fileInfo);
-
-// CARDProgram
-s32 CARDProgramAsync(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset, CARDCallback callback);
-s32 CARDProgram(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset);
-
-// CARDRdwr
-s32 CARDGetXferredBytes(s32 chan);
-
-// CARDRead
-s32 CARDReadAsync(const CARDFileInfo* fileInfo, void* addr, s32 length, s32 offset, CARDCallback callback);
-s32 CARDRead(const CARDFileInfo*  fileInfo, void*  addr, s32 length, s32 offset);
-s32 CARDCancel(CARDFileInfo* fileInfo);
-
-// CARDRename
-s32 CARDRename(s32 chan, const char* oldName, const char* newName);
-
-// CARDStat
-s32 CARDGetStatus(s32 chan, s32 fileNo, CARDStat* stat);
-s32 CARDSetStatusAsync(s32 chan, s32 fileNo, const CARDStat* stat, CARDCallback callback);
-s32 CARDSetStatus(s32 chan, s32 fileNo, const CARDStat*  stat);
-
-// CARDWrite
-s32 CARDWriteAsync(const CARDFileInfo*  fileInfo, const void* addr, s32 length, s32 offset, CARDCallback callback);
-s32 CARDWrite(const CARDFileInfo* fileInfo, const void* addr, s32 length, s32 offset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/db.h

@@ -1,22 +0,0 @@
-#ifndef _DOLPHIN_DB_H_
-#define _DOLPHIN_DB_H_
-
-#include <dolphin/types.h>
-#include <dolphin/db/DBInterface.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define OS_DBINTERFACE_ADDR 0x00000040
-
-BOOL DBIsDebuggerPresent(void);
-void DBPrintf(char* str, ...);
-s32 DBQueryData(void);
-u32 DBRead(u8*, u32);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _DOLPHIN_DB_H_

aurora-main/include/dolphin/db/DBInterface.h

@@ -1,31 +0,0 @@
-#ifndef _DOLPHIN_DBINTERFACE_H_
-#define _DOLPHIN_DBINTERFACE_H_
-
-#include <dolphin/os.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct DBInterface {
-    u32 bPresent;
-    u32 exceptionMask;
-    void (*ExceptionDestination)(void);
-    void* exceptionReturn;
-} DBInterface;
-
-extern DBInterface* __DBInterface;
-
-void DBInit(void);
-void DBInitComm(int* inputFlagPtr, int* mtrCallback);
-void __DBExceptionDestination(void);
-void __DBExceptionDestinationAux(void);
-BOOL __DBIsExceptionMarked(__OSException exception);
-void __DBMarkException(u8 exception, int value);
-void __DBSetPresent(u32 value);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/dolphin.h

@@ -1,24 +0,0 @@
-#ifndef _DOLPHIN_H_
-#define _DOLPHIN_H_
-
-#include <dolphin/types.h>
-#include <dolphin/os.h>
-#include <dolphin/dsp.h>
-#include <dolphin/dvd.h>
-#include <dolphin/gx.h>
-#include <dolphin/hio.h>
-#include <dolphin/mtx.h>
-#include <dolphin/vi.h>
-#include <dolphin/card.h>
-#include <dolphin/perf.h>
-#include <dolphin/ar.h>
-#include <dolphin/base/PPCArch.h>
-#include <dolphin/db.h>
-#include <dolphin/pad.h>
-#include <dolphin/dtk.h>
-#include <dolphin/ai.h>
-// #include <dolphin/demo.h>
-#include <dolphin/exi.h>
-#include <dolphin/si.h>
-
-#endif

aurora-main/include/dolphin/dsp.h

@@ -1,57 +0,0 @@
-#ifndef _DOLPHIN_DSP_H_
-#define _DOLPHIN_DSP_H_
-
-#include <dolphin/os.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*DSPCallback)(void* task);
-typedef struct STRUCT_DSP_TASK DSPTaskInfo;
-
-typedef struct STRUCT_DSP_TASK {                                   
-    /* 0x00 */ volatile u32 state;
-    /* 0x04 */ volatile u32 priority;
-    /* 0x08 */ volatile u32 flags;
-    /* 0x0C */ u16* iram_mmem_addr;
-    /* 0x10 */ u32 iram_length;
-    /* 0x14 */ u32 iram_addr;
-    /* 0x18 */ u16* dram_mmem_addr;
-    /* 0x1C */ u32 dram_length;
-    /* 0x20 */ u32 dram_addr;
-    /* 0x24 */ u16 dsp_init_vector;
-    /* 0x26 */ u16 dsp_resume_vector;
-    /* 0x28 */ DSPCallback init_cb;
-    /* 0x2C */ DSPCallback res_cb;
-    /* 0x30 */ DSPCallback done_cb;
-    /* 0x34 */ DSPCallback req_cb;
-    /* 0x38 */ DSPTaskInfo* next;
-    /* 0x3C */ DSPTaskInfo* prev;
-    /* 0x40 */ OSTime t_context;
-    /* 0x48 */ OSTime t_task;
-} DSPTaskInfo;
-
-u32 DSPCheckMailToDSP(void);
-u32 DSPCheckMailFromDSP(void);
-u32 DSPReadCPUToDSPMbox(void);
-u32 DSPReadMailFromDSP(void);
-void DSPSendMailToDSP(u32 mail);
-void DSPAssertInt(void);
-void DSPInit(void);
-BOOL DSPCheckInit(void);
-void DSPReset(void);
-void DSPHalt(void);
-void DSPUnhalt(void);
-u32 DSPGetDMAStatus(void);
-DECL_WEAK DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
-DSPTaskInfo* DSPCancelTask(DSPTaskInfo* task);
-DSPTaskInfo* DSPAssertTask(DSPTaskInfo* task);
-
-DSPTaskInfo* __DSPGetCurrentTask(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/dtk.h

@@ -1,56 +0,0 @@
-#ifndef _DOLPHIN_DTK_H_
-#define _DOLPHIN_DTK_H_
-
-#include <dolphin/dvd.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*DTKCallback)(u32 eventMask);
-typedef void (*DTKFlushCallback)(void);
-
-typedef struct DTKTrack {
-	/* 0x00 */ struct DTKTrack* prev;
-    /* 0x04 */ struct DTKTrack* next;
-    /* 0x08 */ char* fileName;
-    /* 0x0C */ u32 eventMask;
-    /* 0x10 */ DTKCallback callback;
-    /* 0x14 */ DVDFileInfo dvdFileInfo;
-} DTKTrack;
-
-#define DTK_STATE_STOP    0
-#define DTK_STATE_RUN     1
-#define DTK_STATE_PAUSE   2
-#define DTK_STATE_BUSY    3
-#define DTK_STATE_PREPARE 4
-
-#define DTK_MODE_NOREPEAT  0
-#define DTK_MODE_ALLREPEAT 1
-#define DTK_MODE_REPEAT1   2
-
-void DTKInit(void);
-void DTKShutdown(void);
-u32 DTKQueueTrack(char* fileName, DTKTrack* track, u32 eventMask, DTKCallback callback);
-u32 DTKRemoveTrack(DTKTrack* track);
-int DTKFlushTracks(DTKFlushCallback callback);
-void DTKSetSampleRate(u32 samplerate);
-void DTKSetInterruptFrequency(u32 samples);
-void DTKSetRepeatMode(u32 repeat);
-int DTKSetState(u32 state);
-int DTKNextTrack(void);
-int DTKPrevTrack(void);
-u32 DTKGetSampleRate(void);
-u32 DTKGetRepeatMode(void);
-u32 DTKGetState(void);
-u32 DTKGetPosition(void);
-u32 DTKGetInterruptFrequency(void);
-DTKTrack* DTKGetCurrentTrack(void);
-void DTKSetVolume(u8 left, u8 right);
-u16 DTKGetVolume(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/dvd.h

@@ -1,237 +0,0 @@
-#ifndef _DOLPHIN_DVD_H_
-#define _DOLPHIN_DVD_H_
-
-#include <dolphin/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DVD_ASSERTMSGLINE(line, cond, msg) \
-    if (!(cond)) \
-        OSPanic(__FILE__, line, msg)
-
-#define DVD_ASSERTMSG1LINE(line, cond, msg, arg1) \
-    if (!(cond)) \
-        OSPanic(__FILE__, line, msg, arg1)
-
-#define DVD_ASSERTMSG2LINE(line, cond, msg, arg1, arg2) \
-    if (!(cond)) \
-        OSPanic(__FILE__, line, msg, arg1, arg2)
-
-#define DVD_RESULT_GOOD        0
-#define DVD_RESULT_FATAL_ERROR -1
-#define DVD_RESULT_IGNORED     -2
-#define DVD_RESULT_CANCELED    -6
-
-#define DVD_STATE_FATAL_ERROR   -1
-#define DVD_STATE_END            0
-#define DVD_STATE_BUSY           1
-#define DVD_STATE_WAITING        2
-#define DVD_STATE_COVER_CLOSED   3
-#define DVD_STATE_NO_DISK        4
-#define DVD_STATE_COVER_OPEN     5
-#define DVD_STATE_WRONG_DISK     6
-#define DVD_STATE_MOTOR_STOPPED  7
-#define DVD_STATE_PAUSING        8
-#define DVD_STATE_IGNORED        9
-#define DVD_STATE_CANCELED       10
-#define DVD_STATE_RETRY          11
-
-#define DVD_MIN_TRANSFER_SIZE    32
-
-// could be bitfields
-#define DVD_INTTYPE_TC 1
-#define DVD_INTTYPE_DE 2
-// unk type 3
-#define DVD_INTTYPE_CVR 4
-
-// DVD Commands
-#define DVD_COMMAND_NONE 0
-#define DVD_COMMAND_READ 1
-#define DVD_COMMAND_SEEK 2
-#define DVD_COMMAND_CHANGE_DISK 3
-#define DVD_COMMAND_BSREAD 4
-#define DVD_COMMAND_READID 5
-#define DVD_COMMAND_INITSTREAM 6
-#define DVD_COMMAND_CANCELSTREAM 7
-#define DVD_COMMAND_STOP_STREAM_AT_END 8
-#define DVD_COMMAND_REQUEST_AUDIO_ERROR 9
-#define DVD_COMMAND_REQUEST_PLAY_ADDR 10
-#define DVD_COMMAND_REQUEST_START_ADDR 11
-#define DVD_COMMAND_REQUEST_LENGTH 12
-#define DVD_COMMAND_AUDIO_BUFFER_CONFIG 13
-#define DVD_COMMAND_INQUIRY 14
-#define DVD_COMMAND_BS_CHANGE_DISK 15
-#define DVD_COMMAND_UNK_16 16
-
-typedef struct DVDDiskID {
-    char gameName[4];
-    char company[2];
-    u8 diskNumber;
-    u8 gameVersion;
-    u8 streaming;
-    u8 streamingBufSize;
-    u8 padding[22];
-} DVDDiskID;
-
-typedef struct DVDCommandBlock DVDCommandBlock;
-typedef void (*DVDCBCallback)(s32 result, DVDCommandBlock* block);
-typedef void (*DVDLowCallback)(u32);
-
-typedef void (*DVDCommandCheckerCallback)(u32);
-typedef void (*DVDCommandChecker)(DVDCommandBlock*, DVDCommandCheckerCallback);
-
-struct DVDCommandBlock {
-    /* 0x00 */ DVDCommandBlock* next;
-    /* 0x04 */ DVDCommandBlock* prev;
-    /* 0x08 */ u32 command;
-    /* 0x0C */ s32 state;
-    /* 0x10 */ u32 offset;
-    /* 0x14 */ u32 length;
-    /* 0x18 */ void* addr;
-    /* 0x1C */ u32 currTransferSize;
-    /* 0x20 */ u32 transferredSize;
-    /* 0x24 */ DVDDiskID* id;
-    /* 0x28 */ DVDCBCallback callback;
-    /* 0x2C */ void* userData;
-};
-
-typedef struct DVDFileInfo DVDFileInfo;
-typedef void (*DVDCallback)(s32 result, DVDFileInfo *fileInfo);
-struct DVDFileInfo {
-	/* 0x00 */ DVDCommandBlock cb;
-    /* 0x30 */ u32 startAddr;
-    /* 0x34 */ u32 length;
-    /* 0x38 */ DVDCallback callback;
-};
-
-typedef struct {
-    u32 entryNum;
-    u32 location;
-    u32 next;
-} DVDDir;
-
-typedef struct {
-    u32 entryNum;
-    BOOL isDir;
-    char* name;
-} DVDDirEntry;
-
-typedef struct DVDBB2 {
-    /* 0x00 */ u32 bootFilePosition;
-    /* 0x04 */ u32 FSTPosition;
-    /* 0x08 */ u32 FSTLength;
-    /* 0x0C */ u32 FSTMaxLength;
-    /* 0x10 */ void* FSTAddress;
-    /* 0x14 */ u32 userPosition;
-    /* 0x18 */ u32 userLength;
-    /* 0x1C */ u32 padding0;
-} DVDBB2;
-
-typedef struct DVDDriveInfo {
-    /* 0x00 */ u16 revisionLevel;
-    /* 0x02 */ u16 deviceCode;
-    /* 0x04 */ u32 releaseDate;
-    /* 0x08 */ u8 padding[24];
-} DVDDriveInfo;
-
-// DVD
-void DVDInit(void);
-int DVDReadAbsAsyncPrio(DVDCommandBlock* block, void* addr, s32 length, s32 offset, DVDCBCallback callback, s32 prio);
-int DVDSeekAbsAsyncPrio(DVDCommandBlock* block, s32 offset, DVDCBCallback callback, s32 prio);
-int DVDReadAbsAsyncForBS(DVDCommandBlock* block, void* addr, s32 length, s32 offset, DVDCBCallback callback);
-int DVDReadDiskID(DVDCommandBlock* block, DVDDiskID* diskID, DVDCBCallback callback);
-int DVDPrepareStreamAbsAsync(DVDCommandBlock* block, u32 length, u32 offset, DVDCBCallback callback);
-int DVDCancelStreamAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDCancelStream(DVDCommandBlock* block);
-int DVDStopStreamAtEndAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDStopStreamAtEnd(DVDCommandBlock* block);
-int DVDGetStreamErrorStatusAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDGetStreamErrorStatus(DVDCommandBlock* block);
-int DVDGetStreamPlayAddrAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDGetStreamPlayAddr(DVDCommandBlock* block);
-int DVDGetStreamStartAddrAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDGetStreamStartAddr(DVDCommandBlock* block);
-int DVDGetStreamLengthAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDGetStreamLength(DVDCommandBlock* block);
-int DVDChangeDiskAsyncForBS(DVDCommandBlock* block, DVDCBCallback callback);
-int DVDChangeDiskAsync(DVDCommandBlock* block, DVDDiskID* id, DVDCBCallback callback);
-s32 DVDChangeDisk(DVDCommandBlock* block, DVDDiskID* id);
-int DVDStopMotorAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDStopMotor(DVDCommandBlock* block);
-int DVDInquiryAsync(DVDCommandBlock* block, DVDDriveInfo* info, DVDCBCallback callback);
-s32 DVDInquiry(DVDCommandBlock* block, DVDDriveInfo* info);
-void DVDReset(void);
-int DVDResetRequired(void);
-s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block);
-s32 DVDGetDriveStatus(void);
-BOOL DVDSetAutoInvalidation(BOOL autoInval);
-void DVDPause(void);
-void DVDResume(void);
-int DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback);
-s32 DVDCancel(volatile DVDCommandBlock* block);
-int DVDCancelAllAsync(DVDCBCallback callback);
-s32 DVDCancelAll(void);
-DVDDiskID* DVDGetCurrentDiskID(void);
-BOOL DVDCheckDisk(void);
-
-// DVD FATAL
-int DVDSetAutoFatalMessaging(BOOL enable);
-
-// DVD FS
-s32 DVDConvertPathToEntrynum(const char* pathPtr);
-BOOL DVDFastOpen(s32 entrynum, DVDFileInfo* fileInfo);
-BOOL DVDOpen(const char* fileName, DVDFileInfo* fileInfo);
-BOOL DVDClose(DVDFileInfo* fileInfo);
-BOOL DVDGetCurrentDir(char* path, u32 maxlen);
-BOOL DVDChangeDir(const char* dirName);
-BOOL DVDReadAsyncPrio(DVDFileInfo* fileInfo, void* addr, s32 length, s32 offset,
-                      DVDCallback callback, s32 prio);
-s32 DVDReadPrio(DVDFileInfo* fileInfo, void* addr, s32 length, s32 offset, s32 prio);
-int DVDSeekAsyncPrio(DVDFileInfo* fileInfo, s32 offset, void (* callback)(s32, DVDFileInfo *), s32 prio);
-s32 DVDSeekPrio(DVDFileInfo* fileInfo, s32 offset, s32 prio);
-s32 DVDGetFileInfoStatus(const DVDFileInfo* fileInfo);
-BOOL DVDFastOpenDir(s32 entrynum, DVDDir* dir);
-int DVDOpenDir(const char* dirName, DVDDir* dir);
-int DVDReadDir(DVDDir* dir, DVDDirEntry* dirent);
-int DVDCloseDir(DVDDir* dir);
-void DVDRewindDir(DVDDir* dir);
-void* DVDGetFSTLocation(void);
-const u8* DVDGetDOLLocation(s32* out_size);
-BOOL DVDPrepareStreamAsync(DVDFileInfo* fileInfo, u32 length, u32 offset, DVDCallback callback);
-s32 DVDPrepareStream(DVDFileInfo* fileInfo, u32 length, u32 offset);
-s32 DVDGetTransferredSize(DVDFileInfo* fileinfo);
-
-#define DVDReadAsync(fileInfo, addr, length, offset, callback) \
-    DVDReadAsyncPrio((fileInfo), (addr), (length), (offset), (callback), 2)
-
-// DVD ID UTILS
-int DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2);
-DVDDiskID* DVDGenerateDiskID(DVDDiskID* id, const char* game, const char* company, u8 diskNum, u8 version);
-
-// DVD LOW
-BOOL DVDLowRead(void* addr, u32 length, u32 offset, DVDLowCallback callback);
-BOOL DVDLowSeek(u32 offset, DVDLowCallback callback);
-BOOL DVDLowWaitCoverClose(DVDLowCallback callback);
-BOOL DVDLowReadDiskID(DVDDiskID* diskID, DVDLowCallback callback);
-BOOL DVDLowStopMotor(DVDLowCallback callback);
-BOOL DVDLowRequestError(DVDLowCallback callback);
-BOOL DVDLowInquiry(DVDDriveInfo* info, DVDLowCallback callback);
-BOOL DVDLowAudioStream(u32 subcmd, u32 length, u32 offset, DVDLowCallback callback);
-BOOL DVDLowRequestAudioStatus(u32 subcmd, DVDLowCallback callback);
-BOOL DVDLowAudioBufferConfig(BOOL enable, u32 size, DVDLowCallback callback);
-void DVDLowReset(void);
-DVDLowCallback DVDLowSetResetCoverCallback(DVDLowCallback callback);
-BOOL DVDLowBreak(void);
-DVDLowCallback DVDLowClearCallback(void);
-u32 DVDLowGetCoverStatus(void);
-
-// DVD QUEUE
-void DVDDumpWaitingQueue(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/exi.h

@@ -1,103 +0,0 @@
-#ifndef _DOLPHIN_EXI_H_
-#define _DOLPHIN_EXI_H_
-
-#include <dolphin/os.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EXI_MEMORY_CARD_59 0x00000004
-#define EXI_MEMORY_CARD_123 0x00000008
-#define EXI_MEMORY_CARD_251 0x00000010
-#define EXI_MEMORY_CARD_507 0x00000020
-
-#define EXI_MEMORY_CARD_1019 0x00000040
-#define EXI_MEMORY_CARD_2043 0x00000080
-
-#define EXI_MEMORY_CARD_1019A 0x00000140
-#define EXI_MEMORY_CARD_1019B 0x00000240
-#define EXI_MEMORY_CARD_1019C 0x00000340
-#define EXI_MEMORY_CARD_1019D 0x00000440
-#define EXI_MEMORY_CARD_1019E 0x00000540
-#define EXI_MEMORY_CARD_1019F 0x00000640
-#define EXI_MEMORY_CARD_1019G 0x00000740
-
-#define EXI_MEMORY_CARD_2043A 0x00000180
-#define EXI_MEMORY_CARD_2043B 0x00000280
-#define EXI_MEMORY_CARD_2043C 0x00000380
-#define EXI_MEMORY_CARD_2043D 0x00000480
-#define EXI_MEMORY_CARD_2043E 0x00000580
-#define EXI_MEMORY_CARD_2043F 0x00000680
-#define EXI_MEMORY_CARD_2043G 0x00000780
-
-#define EXI_USB_ADAPTER 0x01010000
-#define EXI_NPDP_GDEV 0x01020000
-
-#define EXI_MODEM  0x02020000
-#define EXI_ETHER  0x04020200
-#define EXI_MIC    0x04060000
-#define EXI_AD16   0x04120000
-#define EXI_RS232C 0x04040404
-#define EXI_ETHER_VIEWER 0x04220001
-#define EXI_STREAM_HANGER 0x04130000
-
-#define EXI_MARLIN 0x03010000
-
-#define EXI_IS_VIEWER 0x05070000
-
-#define EXI_READ  0
-#define EXI_WRITE 1
-
-#define EXI_FREQ_1M  0
-#define EXI_FREQ_2M  1
-#define EXI_FREQ_4M  2
-#define EXI_FREQ_8M  3
-#define EXI_FREQ_16M 4
-#define EXI_FREQ_32M 5
-
-typedef void (*EXICallback)(s32 chan, OSContext* context);
-typedef struct EXIControl {    
-    EXICallback exiCallback;
-    EXICallback tcCallback;
-    EXICallback extCallback;
-    volatile u32 state;
-    int immLen;
-    u8* immBuf;
-    u32 dev;
-    u32 id;
-    s32 idTime;
-    int items;
-    struct {
-        u32 dev;
-        EXICallback callback;
-    } queue[3];
-} EXIControl;
-
-EXICallback EXISetExiCallback(s32 channel, EXICallback callback);
-
-void EXIInit(void);
-BOOL EXILock(s32 channel, u32 device, EXICallback callback);
-BOOL EXIUnlock(s32 channel);
-BOOL EXISelect(s32 channel, u32 device, u32 frequency);
-BOOL EXIDeselect(s32 channel);
-BOOL EXIImm(s32 channel, void* buffer, s32 length, u32 type, EXICallback callback);
-BOOL EXIImmEx(s32 channel, void* buffer, s32 length, u32 type);
-BOOL EXIDma(s32 channel, void* buffer, s32 length, u32 type, EXICallback callback);
-BOOL EXISync(s32 channel);
-BOOL EXIProbe(s32 channel);
-s32 EXIProbeEx(s32 channel);
-BOOL EXIAttach(s32 channel, EXICallback callback);
-BOOL EXIDetach(s32 channel);
-u32 EXIGetState(s32 channel);
-s32 EXIGetID(s32 channel, u32 device, u32* id);
-void EXIProbeReset(void);
-int EXISelectSD(s32 chan, u32 dev, u32 freq);
-s32 EXIGetType(s32 chan, u32 dev, u32* type);
-char* EXIGetTypeString(u32 type);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/gd.h

@@ -1,15 +0,0 @@
-#ifndef _DOLPHIN_GD_H_
-#define _DOLPHIN_GD_H_
-
-#include <dolphin/gd/GDAurora.h>
-#include <dolphin/gd/GDBase.h>
-#include <dolphin/gd/GDFile.h>
-#include <dolphin/gd/GDGeometry.h>
-#include <dolphin/gd/GDIndirect.h>
-#include <dolphin/gd/GDLight.h>
-#include <dolphin/gd/GDPixel.h>
-#include <dolphin/gd/GDTev.h>
-#include <dolphin/gd/GDTexture.h>
-#include <dolphin/gd/GDTransform.h>
-
-#endif

aurora-main/include/dolphin/gd/GDAurora.h

@@ -1,22 +0,0 @@
-#ifndef DOLPHIN_GDAURORA_H
-#define DOLPHIN_GDAURORA_H
-
-/**
- * Pushes a debug group to the backend graphics API. These may show in debugging tools such as RenderDoc.
- *
- * It is considered an error to have unpopped debug groups at the end of the frame. They will be automatically cleared.
- * Debug groups are *not* automatically scoped to a display list.
- */
-void GDPushDebugGroup(const char* label);
-
-/**
- * Pop a debug group previously pushed via GXPushDebugGroup().
- */
-void GDPopDebugGroup();
-
-/**
- * Sends a debug marker to the backend graphics API. These may show in debugging tools such as RenderDoc.
- */
-void GDInsertDebugMarker(const char* label);
-
-#endif // DOLPHIN_GDAURORA_H

aurora-main/include/dolphin/gd/GDBase.h

@@ -1,177 +0,0 @@
-#ifndef _DOLPHIN_GD_BASE_H
-#define _DOLPHIN_GD_BASE_H
-
-#include <dolphin/types.h>
-#include <dolphin/gx/GXEnum.h>
-#include <dolphin/gx/GXCommandList.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*GDOverflowCb)(void);
-
-typedef struct _GDLObj {
-	u8* start;
-	u32 length;
-	u8* ptr;
-	u8* top;
-} GDLObj;
-
-extern GDLObj* __GDCurrentDL;
-
-void GDInitGDLObj(GDLObj* dl, void* start, u32 length);
-void GDFlushCurrToMem(void);
-void GDPadCurr32(void);
-void GDOverflowed(void);
-void GDSetOverflowCallback(GDOverflowCb callback);
-GDOverflowCb GDGetOverflowCallback(void);
-
-inline static void GDOverflowCheck(u32 size) {
-    if (__GDCurrentDL->ptr + size > __GDCurrentDL->top) {
-        GDOverflowed();
-    }
-}
-
-inline static void __GDWrite(u8 data) {
-    *__GDCurrentDL->ptr++ = data;
-}
-
-inline static void GDWrite_data(const void* data, u32 length) {
-    GDOverflowCheck(length);
-    // The compiler realizes this is memcpy, trust.
-    const u8* dataPtr = static_cast<const u8*>(data);
-    for (u32 i = 0; i < length; i++) {
-        __GDWrite(dataPtr[i]);
-    }
-}
-
-inline static void GDWrite_u8(u8 data) {
-    GDOverflowCheck(sizeof(u8));
-    __GDWrite(data);
-}
-
-inline static void GDWrite_u16(u16 data) {
-    GDOverflowCheck(sizeof(u16));
-    __GDWrite((u8)((data >> 8)));
-    __GDWrite((u8)((data >> 0) & 0xFF));
-}
-
-inline static void GDWrite_u24(u32 data) {
-    GDOverflowCheck(3);
-    __GDWrite((u8)((data >> 16) & 0xFF));
-    __GDWrite((u8)((data >> 8) & 0xFF));
-    __GDWrite((u8)((data >> 0) & 0xFF));
-}
-
-inline static void GDWrite_u32(u32 data) {
-    GDOverflowCheck(sizeof(u32));
-    __GDWrite((u8)((data >> 24) & 0xFF));
-    __GDWrite((u8)((data >> 16) & 0xFF));
-    __GDWrite((u8)((data >> 8) & 0xFF));
-    __GDWrite((u8)((data >> 0) & 0xFF));
-}
-
-inline static void GDWrite_u64(u64 data) {
-  GDOverflowCheck(sizeof(u64));
-  __GDWrite((u8)((data >> 56) & 0xFF));
-  __GDWrite((u8)((data >> 48) & 0xFF));
-  __GDWrite((u8)((data >> 40) & 0xFF));
-  __GDWrite((u8)((data >> 32) & 0xFF));
-  __GDWrite((u8)((data >> 24) & 0xFF));
-  __GDWrite((u8)((data >> 16) & 0xFF));
-  __GDWrite((u8)((data >> 8) & 0xFF));
-  __GDWrite((u8)((data >> 0) & 0xFF));
-}
-
-inline static void GDWrite_f32(f32 data) {
-    union {
-        f32 f;
-        u32 u;
-    } fid;
-    fid.f = data;
-    GDWrite_u32(fid.u);
-}
-
-inline static void GDWriteXFCmdHdr(u16 addr, u8 len) {
-    GDWrite_u8(GX_LOAD_XF_REG);
-    GDWrite_u16(len - 1);
-    GDWrite_u16(addr);
-}
-
-inline static void GDWriteXFCmd(u16 addr, u32 val) {
-    GDWrite_u8(GX_LOAD_XF_REG);
-    GDWrite_u16(0);
-    GDWrite_u16(addr);
-    GDWrite_u32(val);
-}
-
-inline static void GDWriteXFIndxDCmd(u16 addr, u8 len, u16 index) {
-    GDWrite_u8(GX_LOAD_INDX_D);
-    GDWrite_u16(index);
-    GDWrite_u16((len - 1) << 12 | addr);
-}
-
-inline static void GDWriteXFIndxACmd(u16 addr, u8 len, u16 index) {
-    GDWrite_u8(GX_LOAD_INDX_A);
-    GDWrite_u16(index);
-    GDWrite_u16(((len - 1) << 12) | addr);
-}
-
-inline static void GDWriteXFIndxBCmd(u16 addr, u8 len, u16 index) {
-    GDWrite_u8(GX_LOAD_INDX_B);
-    GDWrite_u16(index);
-    GDWrite_u16(((len - 1) << 12) | addr);
-}
-
-inline static void GDWriteXFIndxCCmd(u16 addr, u8 len, u16 index) {
-    GDWrite_u8(GX_LOAD_INDX_C);
-    GDWrite_u16(index);
-    GDWrite_u16(((len - 1) << 12) | addr);
-}
-
-inline static void GDWriteCPCmd(u8 addr, u32 val) {
-    GDWrite_u8(GX_LOAD_CP_REG);
-    GDWrite_u8(addr);
-    GDWrite_u32(val);
-}
-
-inline static void GDWriteBPCmd(u32 regval) {
-    GDWrite_u8(GX_LOAD_BP_REG);
-    GDWrite_u32(regval);
-}
-
-inline static void GDWriteAuroraCmd(u16 subCommand) {
-  GDWrite_u8(GX_LOAD_AURORA);
-  GDWrite_u16(subCommand);
-}
-
-inline static void GDSetCurrent(GDLObj* dl) {
-    __GDCurrentDL = dl;
-}
-
-static inline u32 GDGetCurrOffset(void) {
-    return (u32)(__GDCurrentDL->ptr - __GDCurrentDL->start);
-}
-
-static inline void GDSetCurrOffset(u32 offset) {
-    __GDCurrentDL->ptr = __GDCurrentDL->start + offset;
-}
-
-static inline void* GDGetCurrPointer(void) {
-    return (void*)__GDCurrentDL->ptr;
-}
-
-static inline u8* GDGetCurrPointer2(void) {
-    return __GDCurrentDL->ptr;
-}
-
-static inline u32 GDGetGDLObjOffset(const GDLObj* dl) {
-    return (u32)(dl->ptr - dl->start);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

aurora-main/include/dolphin/gd/GDFile.h

@@ -1,31 +0,0 @@
-#ifndef _DOLPHIN_GD_FILE_H
-#define _DOLPHIN_GD_FILE_H
-
-#include <dolphin/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GD_FILE_VERSION_NUMBER 0x11223344
-
-typedef struct _GDGList {
-    void* ptr;
-    u32 byteLength;
-} GDGList;
-
-typedef struct _GDFileHeader {
-    u32 versionNumber;
-    u32 numDLs;
-    u32 numPLs;
-    GDGList* DLDescArray;
-    GDGList* PLDescArray;
-} GDFileHeader;
-
-s32 GDReadDLFile(const char* fName, u32* numDLs, u32* numPLs, GDGList** DLDescArray, GDGList** PLDescArray);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif