Update version to 2.30.0

Forgot to increment it before release oh well...

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: [flibitijibibo]

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - directory: /
+    package-ecosystem: github-actions
+    reviewers:
+      - marysaka
+      - TSRBerry
+    schedule:
+      interval: daily

.github/workflows/build.yml

@@ -0,0 +1,92 @@
+name: build-native
+on:
+  workflow_dispatch:
+    inputs:
+      rev:
+        description: 'Ryujinx/SDL commit to build (this has to be a full commit sha, otherwise it will not work)'
+        required: true
+#  schedule:
+#    - cron: '0 0 * * *'
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    name: ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - { name: win-x64,     os: windows-latest, arch: x64    }
+        # - { name: win-x86,     os: windows-latest, arch: Win32  }
+        - { name: win-arm64,   os: windows-latest, arch: ARM64  }
+        - { name: linux-x64,   os: ubuntu-20.04,   arch: amd64  }
+        # - { name: linux-x86,   os: ubuntu-20.04,   arch: i386   }
+        - { name: linux-arm64, os: ubuntu-20.04,   arch: arm64  }
+        - { name: osx-x64,     os: macos-latest,   arch: x86_64 }
+        - { name: osx-arm64,   os: macos-latest,   arch: arm64  }
+    steps:
+    - name: Setup qemu static
+      uses: docker/setup-qemu-action@v3
+      if: runner.os == 'Linux'
+    - uses: actions/checkout@v4
+      with:
+        repository: Ryujinx/SDL
+        ref: ${{ github.event.inputs.rev }}
+    - uses: actions/checkout@v4
+      with:
+        path: 'SDL2-CS'
+    - name: Build and prepare release
+      run: SDL2-CS/ci/run.sh $PWD $PWD/SDL2-CS/native/${{ matrix.platform.name }} ${{ matrix.platform.arch }}
+      shell: bash
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.platform.name }}-binaries
+        path: install_output
+    - name: Create pull request
+      uses: peter-evans/create-pull-request@v4
+      with:
+        commit-message: Update ${{ matrix.platform.name }} SDL binaries
+        title: Update ${{ matrix.platform.name }} SDL binaries
+        body: This PR has been auto-generated to update the ${{ matrix.platform.name }} SDL binaries.
+        branch: update-${{ matrix.platform.name }}-binaries
+        path: 'SDL2-CS'
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+
+  build-ios:
+    name: ios
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        repository: Ryujinx/SDL
+        ref: ${{ github.event.inputs.rev }}
+    - uses: actions/checkout@v4
+      with:
+        path: 'SDL2-CS'
+    - name: Build (iOS)
+      run: xcodebuild -project Xcode/SDL/SDL.xcodeproj -scheme xcFramework-iOS -configuration Release
+    - name: Prepare release directory (iOS)
+      run: mkdir -p SDL2-CS/native/ios
+    - name: Prepare release (iOS)
+      run: |
+        mkdir -p SDL2-CS/native/ios/SDL2.xcframework/ios-arm64/SDL2.framework;
+        mkdir -p SDL2-CS/native/ios/SDL2.xcframework/ios-arm64_x86_64-simulator/SDL2.framework;
+        cp Xcode/SDL/Products/SDL2.xcframework/Info.plist                                           SDL2-CS/native/ios/SDL2.xcframework/Info.plist;
+        cp Xcode/SDL/Products/SDL2.xcframework/ios-arm64/SDL2.framework/SDL2                        SDL2-CS/native/ios/SDL2.xcframework/ios-arm64/SDL2.framework/SDL2;
+        cp Xcode/SDL/Products/SDL2.xcframework/ios-arm64/SDL2.framework/Info.plist                  SDL2-CS/native/ios/SDL2.xcframework/ios-arm64/SDL2.framework/Info.plist;
+        cp Xcode/SDL/Products/SDL2.xcframework/ios-arm64_x86_64-simulator/SDL2.framework/SDL2       SDL2-CS/native/ios/SDL2.xcframework/ios-arm64_x86_64-simulator/SDL2.framework/SDL2;
+        cp Xcode/SDL/Products/SDL2.xcframework/ios-arm64_x86_64-simulator/SDL2.framework/Info.plist SDL2-CS/native/ios/SDL2.xcframework/ios-arm64_x86_64-simulator/SDL2.framework/Info.plist;
+    - name: Create pull request
+      uses: peter-evans/create-pull-request@v4
+      with:
+        commit-message: Update iOS SDL binaries
+        title: Update iOS SDL binaries
+        body: This PR has been auto-genereated to update the iOS SDL binaries
+        branch: update-ios-binaries
+        path: 'SDL2-CS'
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  workflow_dispatch:
+    inputs: {}
+  #push:
+  #  branches: [ master ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - uses: nuget/setup-nuget@v1
+      with:
+        nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+        nuget-version: '6.x'
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
+    - name: Pack & Publish
+      run: |
+        dotnet pack --version-suffix "build${{ github.run_number }}" -c Release .\SDL2-CS.csproj -o .
+        $file_to_publish = Get-ChildItem -Path $dir -Filter *.nupkg | Select -First 1
+        echo $file_to_publish
+        nuget push $file_to_publish -Source https://api.nuget.org/v3/index.json

.gitlab-ci.yml

@@ -1,58 +0,0 @@
-stages:
-  - build
-  - package
-  - deploy
-
-build_net461:
-  image: mono
-  stage: build
-  only:
-    - schedules
-  script:
-    - ./gitlab-ci/build-net461.sh
-  artifacts:
-    paths:
-      - bin/
-  tags:
-    - docker
-
-build_netcore:
-  image: microsoft/dotnet:2.1-sdk
-  stage: build
-  only:
-    - schedules
-  script:
-    - ./gitlab-ci/build-netcore.sh
-  artifacts:
-    paths:
-      - bin/
-  tags:
-    - docker
-
-package_nuget:
-  image: mono
-  stage: package
-  only:
-    - schedules
-  script:
-    - ./gitlab-ci/package.sh
-  dependencies:
-    - build_net461
-    - build_netcore
-  artifacts:
-    paths:
-      - '*.nupkg'
-
-deploy_nuget:
-  image: mono
-  stage: deploy
-  only:
-    - schedules
-  script:
-    - ./gitlab-ci/deploy.sh
-  dependencies:
-    - package_nuget
-  environment:
-    name: nuget
-    url: http://nuget.org/
-

Makefile

@@ -1,33 +0,0 @@
-# Makefile for SDL2#
-# Written by Ethan "flibitijibibo" Lee
-
-# Source Lists
-SRC = \
-	src/SDL2.cs \
-	src/SDL2_gfx.cs \
-	src/SDL2_image.cs \
-	src/SDL2_mixer.cs \
-	src/SDL2_ttf.cs
-
-# Targets
-
-debug: clean-debug
-	mkdir -p bin/Debug
-	cp app.config bin/Debug/SDL2-CS.dll.config
-	mcs /unsafe -debug -out:bin/Debug/SDL2-CS.dll -target:library $(SRC)
-
-clean-debug:
-	rm -rf bin/Debug
-
-release: clean-release
-	mkdir -p bin/Release
-	cp app.config bin/Release/SDL2-CS.dll.config
-	mcs /unsafe -optimize -out:bin/Release/SDL2-CS.dll -target:library $(SRC)
-
-clean-release:
-	rm -rf bin/Release
-
-clean: clean-debug clean-release
-	rm -rf bin
-
-all: debug release

SDL2-CS.Core.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
-		<Platforms>x64</Platforms>
-	</PropertyGroup>
-	<PropertyGroup>
-		<EnableDefaultItems>false</EnableDefaultItems>
-		<AssemblyName>SDL2-CS</AssemblyName>
-		<RootNamespace>SDL2</RootNamespace>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<PropertyGroup>
-		<SDLSettingsPropsFilePath>$(SolutionDir)SDL2-CS.Settings.props</SDLSettingsPropsFilePath>
-	</PropertyGroup>
-	<Import Project="$(SDLSettingsPropsFilePath)" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
-	<Target Name="ValidatePropsFilePath" BeforeTargets="BeforeBuild">
-		<Message Importance="High" Text="No property overrides found at '$(SDLSettingsPropsFilePath)'" Condition="!Exists('$(SDLSettingsPropsFilePath)')" />
-		<Message Importance="High" Text="Loaded property overrides from '$(SDLSettingsPropsFilePath)'" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
-	</Target>	
-	<ItemGroup>
-		<Compile Include="src\SDL2.cs" />
-		<Compile Include="src\SDL2_gfx.cs" />
-		<Compile Include="src\SDL2_image.cs" />
-		<Compile Include="src\SDL2_mixer.cs" />
-		<Compile Include="src\SDL2_ttf.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="app.config" />
-	</ItemGroup>
-</Project>

SDL2-CS.csproj

@@ -1,102 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85480198-8711-4355-830E-72FD794AD3F6}</ProjectGuid>
+        <TargetFramework>net6.0</TargetFramework>
         <OutputType>Library</OutputType>
-    <RootNamespace>SDL2</RootNamespace>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <AssemblyTitle>SDL2#</AssemblyTitle>
         <AssemblyName>SDL2-CS</AssemblyName>
+        <Description>libSDL2 bindings for C#</Description>
+        <RootNamespace>SDL2</RootNamespace>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <VersionPrefix>2.30.0</VersionPrefix>
     </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PropertyGroup Label="NuGet">
+        <Authors>marysaka &amp; ppy Pty Ltd &amp; flibitijibibo</Authors>
+        <Title>SDL2#</Title>
+        <PackageId>Ryujinx.SDL2-CS</PackageId>
+        <PackageProjectUrl>https://github.com/Ryujinx/SDL2-CS</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/Ryujinx/SDL2-CS</RepositoryUrl>
     </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <SDLSettingsPropsFilePath>$(SolutionDir)SDL2-CS.Settings.props</SDLSettingsPropsFilePath>
-  </PropertyGroup>
-  <Import Project="$(SDLSettingsPropsFilePath)" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
-  <Target Name="ValidatePropsFilePath" BeforeTargets="BeforeBuild">
-    <Message Importance="High" Text="No property overrides found at '$(SDLSettingsPropsFilePath)'" Condition="!Exists('$(SDLSettingsPropsFilePath)')" />
-    <Message Importance="High" Text="Loaded property overrides from '$(SDLSettingsPropsFilePath)'" Condition="Exists('$(SDLSettingsPropsFilePath)')" />
-  </Target>
     <ItemGroup>
-    <Compile Include="src\SDL2.cs" />
-    <Compile Include="src\SDL2_gfx.cs" />
-    <Compile Include="src\SDL2_image.cs" />
-    <Compile Include="src\SDL2_mixer.cs" />
-    <Compile Include="src\SDL2_ttf.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <Link>$(TargetFileName).config</Link>
+        <Content Include="$(MSBuildThisFileDirectory)native\win-x64\SDL2.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+            <PackagePath>runtimes/win-x64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\win-arm64\SDL2.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/win-arm64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\osx-x64\libSDL2.dylib">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/osx-x64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\osx-arm64\libSDL2.dylib">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/osx-arm64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\linux-x64\libSDL2.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/linux-x64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\linux-arm64\libSDL2.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/linux-arm64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\ios\**\*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/ios/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
     </ItemGroup>
     <ItemGroup>
-    <Reference Include="System" />
+        <Content Include="app.config">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
     </ItemGroup>
 </Project>

app.config

@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<dllmap dll="SDL2" os="windows" target="SDL2.dll"/>
-	<dllmap dll="SDL2" os="osx" target="libSDL2-2.0.0.dylib"/>
+	<dllmap dll="SDL2" os="osx" target="libSDL2.dylib"/>
 	<dllmap dll="SDL2" os="linux" target="libSDL2-2.0.so.0"/>
-
-	<dllmap dll="SDL2_gfx" os="windows" target="SDL2_gfx.dll"/>
-	<dllmap dll="SDL2_gfx" os="osx" target="libSDL2_gfx-1.0.0.dylib"/>
-	<dllmap dll="SDL2_gfx" os="linux" target="libSDL2_gfx-1.0.so.0"/>
-
-	<dllmap dll="SDL2_image" os="windows" target="SDL2_image.dll"/>
-	<dllmap dll="SDL2_image" os="osx" target="libSDL2_image-2.0.0.dylib"/>
-	<dllmap dll="SDL2_image" os="linux" target="libSDL2_image-2.0.so.0"/>
-
-	<dllmap dll="SDL2_mixer" os="windows" target="SDL2_mixer.dll"/>
-	<dllmap dll="SDL2_mixer" os="osx" target="libSDL2_mixer-2.0.0.dylib"/>
-	<dllmap dll="SDL2_mixer" os="linux" target="libSDL2_mixer-2.0.so.0"/>
-
-	<dllmap dll="SDL2_ttf" os="windows" target="SDL2_ttf.dll"/>
-	<dllmap dll="SDL2_ttf" os="osx" target="libSDL2_ttf-2.0.0.dylib"/>
-	<dllmap dll="SDL2_ttf" os="linux" target="libSDL2_ttf-2.0.so.0"/>
 </configuration>

appveyor.yml

@@ -0,0 +1,8 @@
+image: Visual Studio 2022
+build_script:
+  - cmd: dotnet restore
+  - cmd: dotnet pack SDL2-CS.csproj -c:Release --include-symbols /p:Version=%APPVEYOR_BUILD_VERSION%
+test: off
+version: 1.0.{build}-alpha
+artifacts:
+  - path: 'bin\Release\*.nupkg'

ci/compile.sh

@@ -0,0 +1,109 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -le 1 ]; then
+    echo "usage: <sdl_dir> <output_path> [build_arch]"
+    exit 1
+fi
+
+uname_system="$(uname -s)"
+
+case "${uname_system}" in
+    Linux*)     system_name=linux;;
+    Darwin*)    system_name=macos;;
+    CYGWIN*)    system_name=win;;
+    MINGW*)     system_name=win;;
+    *)          system_name="Unknown OS: ${uname_system}"
+esac
+
+export DEBIAN_FRONTEND=noninteractive
+
+sdl_dir=$1
+output_path=$2
+build_arch=$3
+
+mkdir -p $output_path
+
+if [ -z "$3" ]; then
+    if [ $system_name == "linux" ]; then
+        build_arch=$(dpkg --print-architecture)
+    else
+        echo "ERROR - build_arch parameter needed on macOS and Windows"
+        exit 1
+    fi
+fi
+
+if command -v sudo &> /dev/null
+then
+    SUDO=sudo
+fi
+
+if [[ $system_name == "linux" ]]; then
+    if [[ $build_arch == "i386" ]]; then
+        sudo dpkg --add-architecture i386
+
+        export CFLAGS=-m32
+        export CXXFLAGS=-m32
+    fi
+
+    $SUDO apt-get update -y
+    $SUDO apt-get install -y \
+            build-essential \
+            cmake \
+            ninja-build \
+            wayland-scanner++ \
+            wayland-protocols \
+            pkg-config:$build_arch \
+            libasound2-dev:$build_arch \
+            libdbus-1-dev:$build_arch \
+            libegl1-mesa-dev:$build_arch \
+            libgl1-mesa-dev:$build_arch \
+            libgles2-mesa-dev:$build_arch \
+            libglu1-mesa-dev:$build_arch \
+            libibus-1.0-dev:$build_arch \
+            libpulse-dev:$build_arch \
+            libsdl2-2.0-0:$build_arch \
+            libsndio-dev:$build_arch \
+            libudev-dev:$build_arch \
+            libwayland-dev:$build_arch \
+            libx11-dev:$build_arch \
+            libxcursor-dev:$build_arch \
+            libxext-dev:$build_arch \
+            libxi-dev:$build_arch \
+            libxinerama-dev:$build_arch \
+            libxkbcommon-dev:$build_arch \
+            libxrandr-dev:$build_arch \
+            libxss-dev:$build_arch \
+            libxt-dev:$build_arch \
+            libxv-dev:$build_arch \
+            libxxf86vm-dev:$build_arch \
+            libdrm-dev:$build_arch \
+            libgbm-dev:$build_arch \
+            libpulse-dev:$build_arch \
+            libhidapi-dev:$build_arch \
+            libwayland-client++0:$build_arch \
+            libwayland-cursor++0:$build_arch
+
+    extra_cmake_flags="-GNinja"
+elif [[ $system_name == "macos" ]]; then
+    extra_cmake_flags="-DCMAKE_OSX_ARCHITECTURES=\"$build_arch\" -DCMAKE_OSX_DEPLOYMENT_TARGET=\"11.0\""
+elif [[ $system_name == "win" ]]; then
+    extra_cmake_flags="-A $build_arch"
+fi
+
+pushd $sdl_dir
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON $extra_cmake_flags
+cmake --build build/ --config Release
+$SUDO cmake --install build/ --prefix install_output --config Release
+
+mkdir -p $output_path
+
+if [[ $system_name == "linux" ]]; then
+    cp install_output/lib/libSDL2-2.0.so.0 $output_path/libSDL2.so
+elif [[ $system_name == "macos" ]]; then
+    cp install_output/lib/libSDL2-2.0.dylib $output_path/libSDL2.dylib
+elif [[ $system_name == "win" ]]; then
+    cp install_output/bin/SDL2.dll $output_path/SDL2.dll
+fi
+popd

ci/run.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -le 2 ]; then
+    echo "usage: <sdl_dir> <output_path> <build_arch>"
+    exit 1
+fi
+
+uname_system="$(uname -s)"
+
+case "${uname_system}" in
+    Linux*)     system_name=linux;;
+    Darwin*)    system_name=macos;;
+    CYGWIN*)    system_name=win;;
+    MINGW*)     system_name=win;;
+    *)          system_name="Unknown OS: ${uname_system}"
+esac
+
+sdl_dir=$1
+output_path=$2
+build_arch=$3
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+mkdir -p $output_path
+
+if [ $system_name == "linux" ] && [ $build_arch == "arm64" ]; then
+    if command -v podman &> /dev/null; then
+        DOCKER=podman
+    elif command -v docker &> /dev/null; then
+        DOCKER=docker
+    else
+        echo "ERROR - Missing docker/podman env, cannot crossbuild"
+        exit 1
+    fi
+
+    $DOCKER run --rm -v $SCRIPT_DIR:/scripts -v $output_path:/output -v $sdl_dir:/source -t arm64v8/ubuntu:focal bash /scripts/compile.sh /source /output $build_arch
+else
+    $SCRIPT_DIR/compile.sh "$sdl_dir" "$output_path" "$build_arch"
+fi

gitlab-ci/SDL2-CS.nuspec

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>SDL2-CS-Rolling</id>
-    <version>2000.1.1</version>
-    <authors>flibitijibibo</authors>
-    <owners>beannaich</owners>
-    <licenseUrl>https://github.com/flibitijibibo/SDL2-CS/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/flibitijibibo/SDL2-CS</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>SDL2# - C# Wrapper for SDL2</description>
-    <copyright>Copyright 2013-2021</copyright>
-    <tags>SDL2# SDL2 SDL</tags>
-  </metadata>
-  <files>
-    <file src="..\bin\Debug\*.dll" target="lib/net461" />
-    <file src="..\bin\Debug\*.dll.config" target="lib/net461" />
-    <file src="..\bin\Debug\*.pdb" target="lib/net461" />
-    <file src="..\bin\Debug\netstandard2.0\*.dll" target="lib/netstandard2.0" />
-    <file src="..\bin\Debug\netstandard2.0\*.dll.config" target="lib/netstandard2.0" />
-    <file src="..\bin\Debug\netstandard2.0\*.pdb" target="lib/netstandard2.0" />
-  </files>
-</package>

gitlab-ci/build-net461.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-msbuild /p:Configuration=Release SDL2-CS.csproj

gitlab-ci/build-netcore.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-dotnet build -c Release SDL2-CS.Core.csproj

gitlab-ci/deploy.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-nuget setApiKey $NUGET_API_KEY -verbosity quiet
-
-for package in `find *.nupkg`; do
-  nuget push $package -source https://nuget.org/
-done

gitlab-ci/package.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-version=`date +"%Y.%m.%d"`
-
-nuspec="gitlab-ci/SDL2-CS.nuspec"
-
-nuget pack $nuspec -Version $version

linux-build/Dockerfile.amd64

@@ -0,0 +1,19 @@
+FROM debian:jessie
+
+# We build on Jessie, but libwayland-dev and wayland-protocols are only in
+# Stretch and later.
+COPY stretch-package-pins /etc/apt/preferences.d/stretch
+
+# Packages are from https://hg.libsdl.org/SDL/file/default/docs/README-linux.md
+RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
+    echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
+    apt-get update && \
+    apt-get install -y build-essential mercurial make cmake autoconf automake \
+      libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \
+      libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \
+      libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \
+      libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
+      fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
+      libxkbcommon-dev wayland-protocols
+
+ENTRYPOINT ["/entry"]

linux-build/Dockerfile.i386

@@ -0,0 +1,19 @@
+FROM i386/debian:jessie
+
+# We build on Jessie, but libwayland-dev and wayland-protocols are only in
+# Stretch and later.
+COPY stretch-package-pins /etc/apt/preferences.d/stretch
+
+# Packages are from https://hg.libsdl.org/SDL/file/default/docs/README-linux.md
+RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
+    echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
+    apt-get update && \
+    apt-get install -y build-essential mercurial make cmake autoconf automake \
+      libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \
+      libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \
+      libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \
+      libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \
+      fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \
+      libxkbcommon-dev wayland-protocols
+
+ENTRYPOINT ["/entry"]

linux-build/compile

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euf -o pipefail
+
+cd /src
+rm -rf build
+mkdir build
+cd build
+../configure --prefix=/io
+make -j$(nproc)
+make install

linux-build/stretch-package-pins

@@ -0,0 +1,27 @@
+Package: *
+Pin: release n=stretch
+Pin-Priority: 50
+
+Package: libwayland-dev
+Pin: release n=stretch
+Pin-Priority: 800
+
+Package: libwayland-bin
+Pin: release n=stretch
+Pin-Priority: 800
+
+Package: libwayland-client0
+Pin: release n=stretch
+Pin-Priority: 800
+
+Package: libwayland-cursor0
+Pin: release n=stretch
+Pin-Priority: 800
+
+Package: libwayland-server0
+Pin: release n=stretch
+Pin-Priority: 800
+
+Package: wayland-protocols
+Pin: release n=stretch
+Pin-Priority: 800

native/ios/SDL2.xcframework/Info.plist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>SDL2.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>SDL2.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

src/SDL2.cs

@@ -37,6 +37,12 @@ namespace SDL2
 {
 	public static class SDL
 	{
+		static SDL()
+		{
+			if (OperatingSystem.IsIOS())
+				NativeLibrary.SetDllImportResolver(typeof(SDL).Assembly, (_, assembly, path) => NativeLibrary.Load("@rpath/SDL2.framework/SDL2", assembly, path));
+		}
+
 		#region SDL2# Variables
 
 		private const string nativeLibName = "SDL2";