Add support for the Amiga CD32 Intro video

Remove AppVeyor testing, and add it for github actions

Author: segrax

.github/workflows/windows-build.yml

@@ -15,44 +15,82 @@ jobs:
             cmake_platform: x64
             configuration: Release
             cmake_extra_args: ""
+            vcpkg_triplet: x64-windows
           - arch: x86
             cmake_platform: Win32
             configuration: Release
             cmake_extra_args: -DWITH_ASM=OFF
+            vcpkg_triplet: x86-windows
     steps:
       - uses: actions/checkout@v4
+      - name: Install FFmpeg (vcpkg)
+        shell: pwsh
+        run: |
+          $vcpkgRoot = "C:\vcpkg"
+          if (-not (Test-Path $vcpkgRoot)) {
+            git clone https://github.com/microsoft/vcpkg $vcpkgRoot
+          }
+          & "$vcpkgRoot\bootstrap-vcpkg.bat"
+          Push-Location $env:GITHUB_WORKSPACE
+          & "$vcpkgRoot\vcpkg.exe" install --triplet ${{ matrix.vcpkg_triplet }}
+          Pop-Location
       - name: Cache CMake deps
         uses: actions/cache@v4
         with:
           path: Projects/VS/_deps
           key: ${{ runner.os }}-${{ matrix.arch }}-cmake-deps-${{ hashFiles('CMakeLists.txt') }}
       - name: Configure
-        run: cmake -S . -B Projects/VS -G "Visual Studio 17 2022" -A ${{ matrix.cmake_platform }} ${{ matrix.cmake_extra_args }}
+        run: cmake -S . -B Projects/VS -G "Visual Studio 17 2022" -A ${{ matrix.cmake_platform }} ${{ matrix.cmake_extra_args }} -DOPENFODDER_ENABLE_FFMPEG=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
       - name: Build
         run: cmake --build Projects/VS --config ${{ matrix.configuration }}
       - name: Test
         shell: pwsh
         run: |
-          New-Item -ItemType Directory -Path C:\built -Force | Out-Null
-          Set-Location C:\built
-          git clone --single-branch https://github.com/OpenFodder/data.git .
-          git clone https://github.com/OpenFodder/tests.git Tests
-          Copy-Item "$env:GITHUB_WORKSPACE\Run\openfodder.exe" -Destination C:\built -Force
-          Copy-Item "$env:GITHUB_WORKSPACE\Run\SDL3.dll" -Destination C:\built -Force
-          Copy-Item "$env:GITHUB_WORKSPACE\Run\SDL3_mixer.dll" -Destination C:\built -Force
+          $runDir = "$env:GITHUB_WORKSPACE\Run"
+          $dataRepo = "$runDir\_data_repo"
+          $testsDir = "$runDir\Tests"
+          New-Item -ItemType Directory -Path $runDir -Force | Out-Null
+          if (Test-Path "$dataRepo\.git") {
+            git -C $dataRepo pull
+          } else {
+            if (Test-Path $dataRepo) { Remove-Item $dataRepo -Recurse -Force }
+            git clone --single-branch https://github.com/OpenFodder/data.git $dataRepo
+          }
+          if (Test-Path "$dataRepo\Data") {
+            Copy-Item "$dataRepo\Data" "$runDir\Data" -Recurse -Force
+          } else {
+            Copy-Item "$dataRepo\*" $runDir -Recurse -Force -Exclude ".git"
+          }
+          if (Test-Path "$testsDir\.git") {
+            git -C $testsDir pull
+          } else {
+            git clone https://github.com/OpenFodder/tests.git $testsDir
+          }
+          $ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
+          Copy-Item "$ffmpegBin\avcodec*.dll" -Destination $runDir -Force
+          Copy-Item "$ffmpegBin\avformat*.dll" -Destination $runDir -Force
+          Copy-Item "$ffmpegBin\avutil*.dll" -Destination $runDir -Force
+          Copy-Item "$ffmpegBin\swscale*.dll" -Destination $runDir -Force
+          Copy-Item "$ffmpegBin\swresample*.dll" -Destination $runDir -Force
+          Push-Location $runDir
           .\openfodder.exe --appveyor --unit-test-headless
+          Pop-Location
       - name: Package
         shell: pwsh
         run: |
           $archive = "OpenFodder-${{ matrix.arch }}-${{ matrix.configuration }}-latest.zip"
+          $ffmpegBin = "C:\vcpkg\installed\${{ matrix.vcpkg_triplet }}\bin"
+          $ffmpegDlls = Get-ChildItem $ffmpegBin -Filter *.dll | Where-Object {
+            $_.Name -match "^(avcodec|avformat|avutil|swscale|swresample)"
+          } | Select-Object -ExpandProperty FullName
           $items = @(
             "$env:GITHUB_WORKSPACE\Run\openfodder.exe",
             "$env:GITHUB_WORKSPACE\Run\SDL3.dll",
             "$env:GITHUB_WORKSPACE\Run\SDL3_mixer.dll",
             "$env:GITHUB_WORKSPACE\README.md",
             "$env:GITHUB_WORKSPACE\COPYING",
             "$env:GITHUB_WORKSPACE\openfodder.ini.example"
-          )
+          ) + $ffmpegDlls
           if (Test-Path $archive) { Remove-Item $archive -Force }
           Compress-Archive -Path $items -DestinationPath $archive
       - name: Upload artifact

CMakeLists.txt

@@ -12,6 +12,8 @@ endif()
 project(openfodder VERSION 1.5.4 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 14)
+option(OPENFODDER_ENABLE_FFMPEG "Enable FFmpeg intro video playback" OFF)
+option(OPENFODDER_AUTO_FFMPEG "Auto-enable FFmpeg when found (non-Windows)" ON)
 
 if(EMSCRIPTEN)
     set(OPENFODDER_EMSCRIPTEN ON)
@@ -129,6 +131,18 @@ target_compile_definitions(openfodder PRIVATE
     _UNICODE
     _USE_MATH_DEFINES)
 
+if (OPENFODDER_ENABLE_FFMPEG OR (OPENFODDER_AUTO_FFMPEG AND NOT WIN32))
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+    find_package(FFmpeg)
+    if (FFmpeg_FOUND)
+        target_compile_definitions(openfodder PRIVATE OPENFODDER_ENABLE_FFMPEG)
+        target_include_directories(openfodder PRIVATE ${FFMPEG_INCLUDE_DIRS})
+        target_link_libraries(openfodder PRIVATE ${FFMPEG_LIBRARIES})
+    elseif(OPENFODDER_ENABLE_FFMPEG)
+        message(WARNING "FFmpeg not found; intro video playback disabled.")
+    endif()
+endif()
+
 if(EMSCRIPTEN)
     target_compile_definitions(openfodder PRIVATE EMSCRIPTEN OPENFODDER_NO_MIXER)
     target_compile_options(openfodder PRIVATE "-sUSE_SDL=3")
@@ -142,7 +156,7 @@ if(EMSCRIPTEN)
         "-sASSERTIONS=1"
         "SHELL:--preload-file ${CMAKE_SOURCE_DIR}/Run@/")
 else()
-    target_link_libraries(openfodder SDL3::SDL3 SDL3_mixer::SDL3_mixer Threads::Threads)
+    target_link_libraries(openfodder PRIVATE SDL3::SDL3 SDL3_mixer::SDL3_mixer Threads::Threads)
 endif()
 
 if(WIN32)

COMPILING.md

@@ -0,0 +1,118 @@
+# Open Fodder build instructions
+
+This document describes how to build Open Fodder from source.
+
+## Windows (Visual Studio 2022 + CMake)
+
+Open Fodder uses CMake's FetchContent to download SDL3 and SDL3_mixer on Windows,
+so a network connection and `git` in `PATH` are required for the first configure.
+
+### Option A: Use the helper script (recommended)
+
+The script locates a Visual Studio installation and builds the default `Release`
+configuration.
+
+```
+Projects\build_vs.cmd
+```
+
+Optional arguments:
+
+```
+Projects\build_vs.cmd x64 Release
+Projects\build_vs.cmd Win32 Release
+Projects\build_vs.cmd x64 Debug
+Projects\build_vs.cmd x64 Release noffmpeg
+```
+
+If `VCPKG_ROOT` (or `vcpkg` in `PATH`) points to a full vcpkg checkout with
+`scripts/buildsystems/vcpkg.cmake`, the script runs `vcpkg install` in the
+repo root and enables intro video playback by default. Use the `noffmpeg`
+argument to skip FFmpeg. The manifest pins a minimal FFmpeg feature set
+(avcodec/avformat/swresample/swscale).
+
+The executable and runtime DLLs are copied to `Run\`.
+
+### Option B: Run CMake manually
+
+From the repo root:
+
+```
+cmake -S . -B Projects/VS -G "Visual Studio 17 2022" -A x64
+cmake --build Projects/VS --config Release
+```
+
+For 32-bit builds, use:
+
+```
+cmake -S . -B Projects/VS -G "Visual Studio 17 2022" -A Win32 -DWITH_ASM=OFF
+cmake --build Projects/VS --config Release
+```
+
+The executable and runtime DLLs are copied to `Run\`.
+
+### FFmpeg intro video (optional)
+
+Linux/macOS: CMake auto-detects FFmpeg by default. If FFmpeg is installed, the
+intro video support is enabled; if not, it is skipped.
+
+Windows: the helper script enables FFmpeg automatically when vcpkg is
+available (use `noffmpeg` to skip it).
+
+Manual enable (any platform):
+
+```
+-DOPENFODDER_ENABLE_FFMPEG=ON
+```
+
+Manual disable of auto-detect (non-Windows):
+
+```
+-DOPENFODDER_AUTO_FFMPEG=OFF
+```
+
+## Linux (Ubuntu example)
+
+On Linux the build links against system-installed SDL3 and SDL3_mixer, so you
+must install them in a way that provides CMake package config files.
+The CI workflow builds and installs them from source:
+
+```
+sudo apt-get update
+sudo apt-get install -y cmake ninja-build build-essential git pkg-config \
+  libasound2-dev libpulse-dev libudev-dev libx11-dev libxext-dev \
+  libxrandr-dev libxcursor-dev libxi-dev libxss-dev libxtst-dev \
+  libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev \
+  libegl1-mesa-dev libgl1-mesa-dev \
+  libflac-dev libogg-dev libvorbis-dev libmpg123-dev libopusfile-dev \
+  libxmp-dev
+
+git clone --depth 1 --branch release-3.4.0 https://github.com/libsdl-org/SDL.git /tmp/SDL
+cmake -S /tmp/SDL -B /tmp/SDL/build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
+cmake --build /tmp/SDL/build
+sudo cmake --install /tmp/SDL/build
+
+git clone --depth 1 https://github.com/libsdl-org/SDL_mixer.git /tmp/SDL_mixer
+cmake -S /tmp/SDL_mixer -B /tmp/SDL_mixer/build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
+  -DSDLMIXER_VENDORED=OFF -DSDLMIXER_MOD_XMP=ON -DSDLMIXER_MOD_XMP_LITE=OFF -DSDLMIXER_MOD_XMP_SHARED=OFF
+cmake --build /tmp/SDL_mixer/build
+sudo cmake --install /tmp/SDL_mixer/build
+```
+
+Then configure and build:
+
+```
+cmake -S . -B build -G Ninja
+cmake --build build
+```
+
+## Tests (optional)
+
+The Windows CI test step uses the data and tests repositories and runs:
+
+```
+openfodder.exe --appveyor --unit-test-headless
+```
+
+You can reproduce this by placing `openfodder.exe` (and its SDL3 DLLs) alongside
+the checked-out data and tests folders.