Bump ext/SDL from a2c1984 to 49d58bc (#421)

* Bump ext/SDL from `a2c1984` to `49d58bc` Bumps [ext/SDL](https://github.com/libsdl-org/SDL) from `a2c1984` to `49d58bc`. - [Release notes](https://github.com/libsdl-org/SDL/releases) - [Commits](libsdl-org/SDL@a2c1984...49d58bc) --- updated-dependencies: - dependency-name: ext/SDL dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update * Update --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas Girouard-Stranks <[email protected]>
bottlenoselabs · Nov 20, 2023 · d4cf38c · d4cf38c
1 parent c82927f
commit d4cf38c
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 155 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,23 +36,6 @@ jobs:
           path: "./lib"
           key: "libs-${{ matrix.platform.rid }}-${{ hashFiles('ext/SDL/**/*') }}-${{ hashFiles('src/c/**/*') }}"
 
-      - name: "Install Windows dependencies"
-        if: runner.os == 'Windows'
-        run: |
-          choco install ninja
-
-      - name: "Install macOS dependencies"
-        if: runner.os == 'macOS'
-        run: |
-          brew install ninja
-
-      - name: Setup Linux dependencies
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install \
-            ninja-build
-
       - name: "Install C2CS"
         shell: bash
         run: dotnet tool install --global bottlenoselabs.C2CS.Tool
@@ -102,6 +85,11 @@ jobs:
           name: "bindgen-cs"
           path: "./src/cs/production/SDL/Generated"
 
-      - name: ".NET Build"
+      - name: "Setup .NET"
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.x'
+
+      - name: "Build .NET solution"
         run: dotnet build "./src/cs"
 
diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 # SDL-cs
 
-Automatically updated C# bindings for `https://github.com/libsdl-org/SDL`, on the `main` branch for v3, with native dynamic link libraries. For v2 of SDL, please see `https://github.com/bottlenoselabs/SDL2-cs`.
+Automatically updated C# bindings for `https://github.com/libsdl-org/SDL`, on the `main` branch for v3, with native dynamic link libraries.
 
 ## How to use
 
 ### From source
 
-1. Download and install [.NET 7](https://dotnet.microsoft.com/download).
+1. Download and install [.NET 8](https://dotnet.microsoft.com/download).
 2. Fork the repository using GitHub or clone the repository manually with submodules: `git clone --recurse-submodules https://github.com/bottlenoselabs/SDL-cs`.
-3. Build the native library by running `library.sh`. To execute `.sh` scripts on Windows, use Git Bash which can be installed with Git itself: https://git-scm.com/download/win. The `library.sh` script requires that CMake and Ninja is installed and in your path.
+3. Build the native library by running `library.sh`. To execute `.sh` scripts on Windows, use Git Bash which can be installed with Git itself: https://git-scm.com/download/win. The `library.sh` script requires that CMake is installed and in your environment variable `PATH`.
 4. Add the `src/cs/production/SDL/SDL.csproj` C# project to your solution as an existing project and then reference it within your own solution.
 
 ## Developers: Documentation

diff --git a/SDL.props b/SDL.props
diff --git a/config.json b/config.json
diff --git a/ext/SDL b/ext/SDL
diff --git a/src/cs/Directory.Build.props b/src/cs/Directory.Build.props
@@ -6,10 +6,9 @@
     <Using Include="bottlenoselabs.C2CS" />
   </ItemGroup>
 
-  <!-- .NET8: Use artifacts path for bin/obj output folders -->
+  <!-- Use artifacts path for bin/obj output folders -->
   <PropertyGroup>
     <UseArtifactsOutput>true</UseArtifactsOutput>
-    <ArtifactsPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))/artifacts</ArtifactsPath>
   </PropertyGroup>
 
   <!-- NuGet package references -->

diff --git a/src/cs/production/SDL/SDL.csproj b/src/cs/production/SDL/SDL.csproj
@@ -2,7 +2,7 @@
 
   <!-- MSBuild settings -->
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace />
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/cs/samples/HelloWorld/HelloWorld.csproj b/src/cs/samples/HelloWorld/HelloWorld.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/src/cs/samples/HelloWorld/Program.cs b/src/cs/samples/HelloWorld/Program.cs
@@ -26,7 +26,7 @@ private static int Main()
         {
             // Get the next event
             SDL_Event e;
-            if (SDL_PollEvent(&e) != 0)
+            if (SDL_PollEvent(&e))
             {
                 Frame();
 
@@ -84,7 +84,6 @@ private static void PrintWindowFlags(SDL_Window* window)
         Console.WriteLine(@$"Window: ""Mouse grabbed"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_MOUSE_GRABBED) != 0}");
         Console.WriteLine(@$"Window: ""Input focus"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_INPUT_FOCUS) != 0}");
         Console.WriteLine(@$"Window: ""Mouse focus"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_MOUSE_FOCUS) != 0}");
-        Console.WriteLine(@$"Window: ""Foreign"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_FOREIGN) != 0}");
         Console.WriteLine(@$"Window: ""Mouse capture"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_MOUSE_CAPTURE) != 0}");
         Console.WriteLine(@$"Window: ""Always on top"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_ALWAYS_ON_TOP) != 0}");
         Console.WriteLine(@$"Window: ""Utility"" = {(windowFlags & (ulong)SDL_WindowFlags.SDL_WINDOW_UTILITY) != 0}");