Update workflows, fix linux i686

Author: birabittoh

.github/workflows/build.yaml

@@ -13,15 +13,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "Windows x86_64", os: windows-latest, msys2_sys: MINGW64, msys2_env: mingw-w64-x86_64 }
-          - { name: "Windows i686",   os: windows-latest, msys2_sys: MINGW32, msys2_env: mingw-w64-i686   }
-          - { name: "Linux x86_64",   os: ubuntu-latest,  linux_arch: x86_64 }
-          - { name: "Linux i686",     os: ubuntu-latest,  linux_arch: i686   }
-          - { name: "macOS ARM64",    os: macos-latest  }
-          - { name: "macOS x86_64",   os: macos-latest, macos_arch: x86_64 }
+          - { name: "Windows-x86_64", os: windows-latest, msys2_sys: MINGW64, msys2_env: mingw-w64-x86_64 }
+          - { name: "Windows-i686",   os: windows-latest, msys2_sys: MINGW32, msys2_env: mingw-w64-i686   }
+          - { name: "Linux-x86_64",   os: ubuntu-latest,  linux_arch: x86_64 }
+          - { name: "Linux-i686",     os: ubuntu-latest,  linux_arch: i686   }
+          - { name: "macOS-ARM64",    os: macos-latest  }
+          - { name: "macOS-x86_64",   os: macos-latest, macos_arch: x86_64 }
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       # ── Windows ──────────────────────────────────────────────────────
       - uses: msys2/setup-msys2@v2
@@ -55,8 +55,11 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install -y gcc-i686-linux-gnu g++-i686-linux-gnu cmake \
-            libsdl2-dev:i386 libgl-dev:i386
+          sudo apt-get install -y gcc-multilib g++-multilib cmake
+          # Install 32-bit libraries without dev packages to avoid glib conflicts
+          sudo apt-get install -y libsdl2-2.0-0:i386 libgl1:i386 libglx0:i386 libopengl0:i386
+          # Install x86_64 dev packages (headers are arch-independent)
+          sudo apt-get install -y libsdl2-dev libgl-dev
 
       - name: Build (Linux x86_64)
         if: runner.os == 'Linux' && matrix.linux_arch == 'x86_64'
@@ -109,13 +112,13 @@ jobs:
           arch -x86_64 make -j$(sysctl -n hw.ncpu)
 
       # ── Artifacts ─────────────────────────────────────────────────────
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: runner.os == 'Windows' || (runner.os == 'Linux' && matrix.linux_arch == 'x86_64') || runner.os == 'macOS'
         with:
           name: AnimalCrossing-${{ matrix.name }}
           path: pc/build/bin/
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: runner.os == 'Linux' && matrix.linux_arch == 'i686'
         with:
           name: AnimalCrossing-${{ matrix.name }}

pc/cmake/Toolchain-linux32.cmake

@@ -1,7 +1,34 @@
 # CMake toolchain file for Linux i686 (32-bit) cross-compilation
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR i686)
-set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
-set(CMAKE_CXX_COMPILER i686-linux-gnu-g++)
+
+# Use multilib gcc/g++ instead of cross-compiler
+set(CMAKE_C_COMPILER gcc)
+set(CMAKE_CXX_COMPILER g++)
+
+# Force 32-bit compilation
 set(CMAKE_C_FLAGS "-m32" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-m32" CACHE STRING "")
+set(CMAKE_EXE_LINKER_FLAGS "-m32" CACHE STRING "")
+set(CMAKE_SHARED_LINKER_FLAGS "-m32" CACHE STRING "")
+
+# Tell CMake to look for 32-bit libraries
+set(CMAKE_LIBRARY_ARCHITECTURE i386-linux-gnu)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+
+# Help CMake find 32-bit libraries
+set(CMAKE_LIBRARY_PATH /usr/lib/i386-linux-gnu)
+set(CMAKE_FIND_ROOT_PATH /usr/lib/i386-linux-gnu)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+
+# Explicitly set OpenGL library paths for 32-bit linking
+# Use runtime libraries (.so.0) since dev packages cause dependency conflicts
+set(OPENGL_opengl_LIBRARY /usr/lib/i386-linux-gnu/libOpenGL.so.0 CACHE FILEPATH "")
+set(OPENGL_glx_LIBRARY /usr/lib/i386-linux-gnu/libGLX.so.0 CACHE FILEPATH "")
+
+# Workaround: SDL2's multiarch wrapper includes <SDL2/_real_SDL_config.h> which
+# lives in /usr/include/<arch>/SDL2/. Since we can't install libsdl2-dev:i386
+# (causes glib conflicts), we use the x86_64 headers which are arch-independent.
+include_directories(BEFORE SYSTEM /usr/include/x86_64-linux-gnu)