Skip to content

Fix CI buildbot failures: MSVC C89, SSE2 32-bit, webOS cross-compile #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoeMatt merged 3 commits into from
Apr 23, 2026
Merged

Fix CI buildbot failures: MSVC C89, SSE2 32-bit, webOS cross-compile #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce3187b
Fix CI buildbot failures, expand CI coverage, add release automation
JoeMatt Apr 23, 2026
8e63cd1
Fix C89 mixed declarations in gpu.c state save/load
JoeMatt Apr 23, 2026
2c20be7
Update CLAUDE.md with C89 rules, testing, and CD docs
JoeMatt Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 108 additions & 9 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
build:
Expand All @@ -31,6 +32,13 @@ jobs:
cc: 'gcc'
cxx: 'g++'

- displayTargetName: 'Linux i686'
artifact: 'virtualjaguar_libretro.so'
os: ubuntu-latest
cc: 'gcc -m32'
cxx: 'g++ -m32'
multilib: true

# macOS
- displayTargetName: 'macOS arm64 (Clang)'
artifact: 'virtualjaguar_libretro.dylib'
Expand All @@ -45,13 +53,52 @@ jobs:
cc: 'gcc'
cxx: 'g++'
shell: 'msys2 {0}'
msystem: 'MINGW64'
msys2_packages: 'mingw-w64-x86_64-gcc make'

- displayTargetName: 'Windows i686 (MSYS2)'
artifact: 'virtualjaguar_libretro.dll'
os: windows-latest
cc: 'gcc'
cxx: 'g++'
shell: 'msys2 {0}'
msystem: 'MINGW32'
msys2_packages: 'mingw-w64-i686-gcc make'

# Emscripten (WebAssembly)
- displayTargetName: 'Emscripten (WASM)'
artifact: 'virtualjaguar_libretro_emscripten.bc'
os: ubuntu-latest
emscripten: true

# Android NDK (arm64-v8a)
- displayTargetName: 'Android arm64-v8a'
artifact: 'libs/arm64-v8a/libretro.so'
os: ubuntu-latest
android: true
android_abi: 'arm64-v8a'

# Android NDK (armeabi-v7a)
- displayTargetName: 'Android armeabi-v7a'
artifact: 'libs/armeabi-v7a/libretro.so'
os: ubuntu-latest
android: true
android_abi: 'armeabi-v7a'

# iOS
- displayTargetName: 'iOS arm64'
artifact: 'virtualjaguar_libretro_ios.dylib'
os: macos-latest
make_platform: 'ios-arm64'
cross: true

# tvOS
- displayTargetName: 'tvOS arm64'
artifact: 'virtualjaguar_libretro_tvos.dylib'
os: macos-latest
make_platform: 'tvos-arm64'
cross: true

name: build-${{ matrix.config.displayTargetName }}
runs-on: ${{ matrix.config.os }}

Expand All @@ -62,45 +109,68 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install multilib
if: matrix.config.multilib
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y gcc-multilib g++-multilib

- name: Set up MSYS2
if: runner.os == 'Windows'
uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
msystem: ${{ matrix.config.msystem || 'MINGW64' }}
update: false
install: >-
mingw-w64-x86_64-gcc
make
install: ${{ matrix.config.msys2_packages || 'mingw-w64-x86_64-gcc make' }}

- name: Set up Emscripten
if: matrix.config.emscripten
uses: mymindstorm/setup-emsdk@v14

- name: Set up Android NDK
if: matrix.config.android
uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r26d

- name: Build
if: ${{ !matrix.config.emscripten }}
run: make -j4 CC=${{ matrix.config.cc }} CXX=${{ matrix.config.cxx }}
if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.make_platform }}
run: make -j4 CC="${{ matrix.config.cc }}" CXX="${{ matrix.config.cxx }}"

- name: Build (platform)
if: matrix.config.make_platform
run: make -j4 platform=${{ matrix.config.make_platform }}

- name: Build (Emscripten)
if: matrix.config.emscripten
run: emmake make -j4 platform=emscripten

- name: Build (Android NDK)
if: matrix.config.android
run: |
${{ steps.setup-ndk.outputs.ndk-path }}/ndk-build \
APP_ABI=${{ matrix.config.android_abi }} -j4

- name: Run SIMD blitter tests
if: ${{ !matrix.config.emscripten }}
if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.cross }}
run: |
ARCH=$(uname -m)
CC="${{ matrix.config.cc }}"
case "$ARCH" in
x86_64|i686|i386) SIMD_SRC=src/blitter_simd_sse2.c; EXTRA="-msse2" ;;
aarch64|arm64) SIMD_SRC=src/blitter_simd_neon.c; EXTRA="" ;;
*) SIMD_SRC=src/blitter_simd_scalar.c; EXTRA="" ;;
esac

echo "==> Testing ${SIMD_SRC}..."
${{ matrix.config.cc }} -O2 -Wall ${EXTRA} -I src \
$CC -O2 -Wall ${EXTRA} -I src \
-o test_blitter_simd test/test_blitter_simd.c ${SIMD_SRC}
./test_blitter_simd

echo "==> Cross-checking against scalar..."
${{ matrix.config.cc }} -O2 -Wall -I src \
$CC -O2 -Wall -I src \
-o test_blitter_scalar test/test_blitter_simd.c src/blitter_simd_scalar.c
./test_blitter_scalar

Expand All @@ -110,3 +180,32 @@ jobs:
name: ${{ matrix.config.displayTargetName }}
path: ${{ matrix.config.artifact }}
if-no-files-found: error

c89-lint:
name: C89 compliance check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Check for declaration-after-statement
run: |
echo "==> Checking C89 compliance (catches MSVC C89 errors)..."
FAILED=0
for f in libretro.c src/*.c; do
# Skip machine-generated files
case "$f" in
src/m68000/*|src/jag*bios*.c|src/jagstub*bios.c|src/blitter_simd_neon.c|src/blitter_simd_sse2.c) continue ;;
esac
if ! gcc -fsyntax-only -std=gnu89 \
-Werror=declaration-after-statement \
-I. -Isrc -Isrc/m68000 -Ilibretro-common/include \
-D__LIBRETRO__ -DINLINE="inline" \
Copy link

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the C89 lint job, -DINLINE="inline" overrides retro_inline.h and may break -std=c89 parsing (since inline is not a C89 keyword). Consider removing this define entirely (letting retro_inline.h pick __inline__ for GCC), or set it to a C89-safe token like __inline__/empty to avoid false CI failures.

Suggested change
-D__LIBRETRO__ -DINLINE="inline" \
-D__LIBRETRO__ \

Copilot uses AI. Check for mistakes.
"$f" 2>&1; then
FAILED=1
fi
done
if [ "$FAILED" = "1" ]; then
echo "::error::C89 compliance check failed — mid-block declarations found"
exit 1
fi
echo "==> All files pass C89 declaration check"
99 changes: 90 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
fail-fast: false
matrix:
config:
# Linux
- platform: linux-x86_64
artifact: virtualjaguar_libretro.so
os: ubuntu-latest
Expand All @@ -25,18 +26,69 @@ jobs:
cc: gcc
cxx: g++

- platform: linux-i686
artifact: virtualjaguar_libretro.so
os: ubuntu-latest
cc: 'gcc -m32'
cxx: 'g++ -m32'
multilib: true

# macOS
- platform: macos-arm64
artifact: virtualjaguar_libretro.dylib
os: macos-latest
cc: clang
cxx: clang++

# Windows
- platform: windows-x86_64
artifact: virtualjaguar_libretro.dll
os: windows-latest
cc: gcc
cxx: g++
shell: 'msys2 {0}'
msystem: 'MINGW64'
msys2_packages: 'mingw-w64-x86_64-gcc make'

- platform: windows-i686
artifact: virtualjaguar_libretro.dll
os: windows-latest
cc: gcc
cxx: g++
shell: 'msys2 {0}'
msystem: 'MINGW32'
msys2_packages: 'mingw-w64-i686-gcc make'

# Emscripten (WebAssembly)
- platform: emscripten-wasm
artifact: virtualjaguar_libretro_emscripten.bc
os: ubuntu-latest
emscripten: true

# Android NDK
- platform: android-arm64-v8a
artifact: libs/arm64-v8a/libretro.so
os: ubuntu-latest
android: true
android_abi: 'arm64-v8a'

- platform: android-armeabi-v7a
artifact: libs/armeabi-v7a/libretro.so
os: ubuntu-latest
android: true
android_abi: 'armeabi-v7a'

# iOS
- platform: ios-arm64
artifact: virtualjaguar_libretro_ios.dylib
os: macos-latest
make_platform: 'ios-arm64'

# tvOS
- platform: tvos-arm64
artifact: virtualjaguar_libretro_tvos.dylib
os: macos-latest
make_platform: 'tvos-arm64'

name: build-${{ matrix.config.platform }}
runs-on: ${{ matrix.config.os }}
Expand All @@ -48,25 +100,54 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install multilib
if: matrix.config.multilib
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y gcc-multilib g++-multilib

- name: Set up MSYS2
if: runner.os == 'Windows'
uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
msystem: ${{ matrix.config.msystem || 'MINGW64' }}
update: false
install: >-
mingw-w64-x86_64-gcc
make
install: ${{ matrix.config.msys2_packages || 'mingw-w64-x86_64-gcc make' }}

- name: Set up Emscripten
if: matrix.config.emscripten
uses: mymindstorm/setup-emsdk@v14

- name: Set up Android NDK
if: matrix.config.android
uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r26d

- name: Build
run: make -j4 CC=${{ matrix.config.cc }} CXX=${{ matrix.config.cxx }}
if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.make_platform }}
run: make -j4 CC="${{ matrix.config.cc }}" CXX="${{ matrix.config.cxx }}"

- name: Build (platform)
if: matrix.config.make_platform
run: make -j4 platform=${{ matrix.config.make_platform }}

- name: Build (Emscripten)
if: matrix.config.emscripten
run: emmake make -j4 platform=emscripten

- name: Build (Android NDK)
if: matrix.config.android
run: |
${{ steps.setup-ndk.outputs.ndk-path }}/ndk-build \
APP_ABI=${{ matrix.config.android_abi }} -j4

- name: Package
run: |
mkdir -p dist
cp ${{ matrix.config.artifact }} dist/virtualjaguar_libretro-${{ matrix.config.platform }}${SUFFIX}
env:
SUFFIX: ${{ matrix.config.platform == 'windows-x86_64' && '.dll' || (matrix.config.platform == 'macos-arm64' && '.dylib' || '.so') }}
cp ${{ matrix.config.artifact }} dist/virtualjaguar_libretro-${{ matrix.config.platform }}$(echo "${{ matrix.config.artifact }}" | grep -o '\.[^.]*$')

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand All @@ -91,7 +172,7 @@ jobs:
GH_TOKEN: ${{ github.token }}
run: |
TAG="${GITHUB_REF_NAME}"
# Collect all built binaries
echo "==> Creating release ${TAG} with artifacts:"
find artifacts/ -type f | sort

gh release create "${TAG}" \
Expand Down
Loading
Loading