Skip to content

Commit

Permalink
Bump SDL to 2.28.4
Browse files Browse the repository at this point in the history
  • Loading branch information
harry-cpp committed Oct 4, 2023
1 parent 7df9726 commit 4ca2493
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
4 changes: 2 additions & 2 deletions MonoGame.Library.SDL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<Link>SDL2.dll</Link>
<PackagePath>runtimes\win-x64\native</PackagePath>
</Content>
<Content Include="artifacts-macos\libSDL2.dylib">
<Link>libSDL2.dylib</Link>
<Content Include="artifacts-macos\libSDL2-2.0.0.dylib">
<Link>libSDL2-2.0.0.dylib</Link>
<PackagePath>runtimes\osx\native</PackagePath>
</Content>
<Content Include="artifacts-linux-x64\libSDL2-2.0.so.0">
Expand Down
15 changes: 2 additions & 13 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,15 @@ Task("BuildMacOS")
.WithCriteria(() => IsRunningOnMacOs())
.Does(() =>
{
// Set new minimum target to 10.15
var filePaths = new[] { "sdl/build-scripts/clang-fat.sh" };
foreach (var filePath in filePaths)
ReplaceRegexInFiles(filePath, @"10\.11", "10.15", System.Text.RegularExpressions.RegexOptions.Singleline);
// Build
var buildDir = "sdl/build";
CreateDirectory(buildDir);
StartProcess("sdl/configure", new ProcessSettings {
WorkingDirectory = buildDir,
EnvironmentVariables = new Dictionary<string, string>{
{ "CC", "../build-scripts/clang-fat.sh" }
}
});
StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildDir, Arguments = "../ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_BUILD_TYPE=Release" });
StartProcess("make", new ProcessSettings { WorkingDirectory = buildDir });
// Copy artifact
CreateDirectory(artifactsDir);
CopyFile("sdl/build/build/.libs/libSDL2-2.0.0.dylib", $"{artifactsDir}/libSDL2.dylib");
CopyFile("sdl/build/libSDL2-2.0.0.dylib", $"{artifactsDir}/libSDL2-2.0.0.dylib");
});

Task("BuildLinux")
Expand Down
2 changes: 1 addition & 1 deletion sdl
Submodule sdl updated 959 files

0 comments on commit 4ca2493

Please sign in to comment.