diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d30f68e..77692bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,7 @@ jobs: - { name: win-x64, os: windows-latest, flags: -A x64 } - { name: win-x86, os: windows-latest, flags: -A Win32 } - { name: win-arm64, os: windows-latest, flags: -A ARM64 } - - { name: linux-x64, os: ubuntu-20.04, flags: -GNinja, target_apt_arch: ":amd64" } - - { name: linux-x86, os: ubuntu-20.04, flags: -GNinja, cmake_configure_env: CFLAGS=-m32 CXXFLAGS=-m32, target_apt_arch: ":i386" } + - { name: linux-x64, os: ubuntu-20.04, flags: -GNinja } - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" } # NOTE: macOS 11.0 is the first released supported by Apple Silicon. - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" } @@ -27,82 +26,58 @@ jobs: - name: Setup Linux dependencies if: runner.os == 'Linux' run: | - if [[ ${{ matrix.platform.target_apt_arch }} == :i386 ]]; then - sudo dpkg --add-architecture i386 - fi + # See https://github.com/libsdl-org/SDL/blob/main/.github/workflows/main.yml + sudo apt-get update + sudo apt-get install build-essential git \ + pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \ + libaudio-dev libjack-dev libsndio-dev libusb-1.0-0-dev libx11-dev libxext-dev \ + libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev \ + libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \ + libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev - sudo apt-get update -y -qq - - if [[ ${{ matrix.platform.target_apt_arch }} == :i386 ]]; then - # Workaround GitHub's ubuntu-20.04 image issue - sudo apt-get install -y --allow-downgrades libpcre2-8-0=10.34-7 - fi - - sudo apt-get install -y \ - gcc-multilib \ - g++-multilib \ - cmake \ - ninja-build \ - wayland-scanner++ \ - wayland-protocols \ - pkg-config${{ matrix.platform.target_apt_arch }} \ - libasound2-dev${{ matrix.platform.target_apt_arch }} \ - libdbus-1-dev${{ matrix.platform.target_apt_arch }} \ - libegl1-mesa-dev${{ matrix.platform.target_apt_arch }} \ - libgl1-mesa-dev${{ matrix.platform.target_apt_arch }} \ - libgles2-mesa-dev${{ matrix.platform.target_apt_arch }} \ - libglu1-mesa-dev${{ matrix.platform.target_apt_arch }} \ - libibus-1.0-dev${{ matrix.platform.target_apt_arch }} \ - libpulse-dev${{ matrix.platform.target_apt_arch }} \ - libsndio-dev${{ matrix.platform.target_apt_arch }} \ - libudev-dev${{ matrix.platform.target_apt_arch }} \ - libwayland-dev${{ matrix.platform.target_apt_arch }} \ - libx11-dev${{ matrix.platform.target_apt_arch }} \ - libxcursor-dev${{ matrix.platform.target_apt_arch }} \ - libxext-dev${{ matrix.platform.target_apt_arch }} \ - libxi-dev${{ matrix.platform.target_apt_arch }} \ - libxinerama-dev${{ matrix.platform.target_apt_arch }} \ - libxkbcommon-dev${{ matrix.platform.target_apt_arch }} \ - libxrandr-dev${{ matrix.platform.target_apt_arch }} \ - libxss-dev${{ matrix.platform.target_apt_arch }} \ - libxt-dev${{ matrix.platform.target_apt_arch }} \ - libxv-dev${{ matrix.platform.target_apt_arch }} \ - libxxf86vm-dev${{ matrix.platform.target_apt_arch }} \ - libdrm-dev${{ matrix.platform.target_apt_arch }} \ - libgbm-dev${{ matrix.platform.target_apt_arch }} \ - libpulse-dev${{ matrix.platform.target_apt_arch }} - uses: actions/checkout@v4 with: repository: 'libsdl-org/SDL' ref: 'main' + - uses: actions/checkout@v4 with: path: 'SDL3-CS' + - name: Configure CMake run: ${{ matrix.platform.cmake_configure_env }} cmake -B build ${{ matrix.platform.flags }} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON + - name: Build run: cmake --build build/ --config Release + - name: Install (Windows) run: cmake --install build/ --prefix install_output --config Release if: runner.os == 'Windows' + - name: Install run: sudo cmake --install build/ --prefix install_output --config Release if: runner.os != 'Windows' + - name: Prepare release directory (Windows) run: mkdir -Force SDL3-CS/native/${{ matrix.platform.name }} if: runner.os == 'Windows' + - name: Prepare release directory run: mkdir -p SDL3-CS/native/${{ matrix.platform.name }} if: runner.os != 'Windows' + - name: Prepare release (Windows) run: cp install_output/bin/SDL3.dll SDL3-CS/native/${{ matrix.platform.name }}/SDL3.dll if: runner.os == 'Windows' + - name: Prepare release (Linux) run: cp install_output/lib/libSDL3.so SDL3-CS/native/${{ matrix.platform.name }}/libSDL3.so if: runner.os == 'Linux' + - name: Prepare release (macOS) run: cp install_output/lib/libSDL3.dylib SDL3-CS/native/${{ matrix.platform.name }}/libSDL3.dylib if: runner.os == 'macOS' + - name: Create pull request uses: peter-evans/create-pull-request@v6 with: @@ -122,13 +97,17 @@ jobs: with: repository: 'libsdl-org/SDL' ref: 'main' + - uses: actions/checkout@v4 with: path: 'SDL3-CS' + - name: Build (iOS) run: xcodebuild -project Xcode/SDL/SDL.xcodeproj -target SDL3.xcframework -configuration Release + - name: Prepare release directory (iOS) run: mkdir -p SDL3-CS/native/ios + - name: Prepare release (iOS) run: | mkdir -p SDL3-CS/native/ios/SDL3.xcframework/ios-arm64/SDL3.framework; @@ -138,6 +117,7 @@ jobs: cp Xcode/SDL/build/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist SDL3-CS/native/ios/SDL3.xcframework/ios-arm64/SDL3.framework/Info.plist; cp Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3 SDL3-CS/native/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/SDL3; cp Xcode/SDL/build/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist SDL3-CS/native/ios/SDL3.xcframework/ios-arm64_x86_64-simulator/SDL3.framework/Info.plist; + - name: Create pull request uses: peter-evans/create-pull-request@v6 with: diff --git a/SDL3-CS/SDL3-CS.csproj b/SDL3-CS/SDL3-CS.csproj index 99238b6..526230c 100644 --- a/SDL3-CS/SDL3-CS.csproj +++ b/SDL3-CS/SDL3-CS.csproj @@ -59,11 +59,6 @@ runtimes/linux-x64/native true - - PreserveNewest - runtimes/linux-x86/native - true - PreserveNewest runtimes/ios/native diff --git a/native/linux-x86/libSDL3.so b/native/linux-x86/libSDL3.so deleted file mode 100644 index bb2c957..0000000 Binary files a/native/linux-x86/libSDL3.so and /dev/null differ