GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_wayland drag wip
Some checks are pending
Build Android / Game (Android, Release ARM64) (push) Waiting to run
Details
Build iOS / Game (iOS, Release ARM64) (push) Waiting to run
Details
Build Linux / Editor (Linux, Development x64) (push) Waiting to run
Details
Build Linux / Game (Linux, Release x64) (push) Waiting to run
Details
Build macOS / Editor (Mac, Development ARM64) (push) Waiting to run
Details
Build macOS / Game (Mac, Release ARM64) (push) Waiting to run
Details
Build Windows / Editor (Windows, Development x64) (push) Waiting to run
Details
Build Windows / Game (Windows, Release x64) (push) Waiting to run
Details
Cooker / Cook (Mac) (push) Waiting to run
Details
Tests / Tests (Linux) (push) Waiting to run
Details
Tests / Tests (Windows) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Ari Vuollet
2025-01-10 01:00:38 +02:00
parent d41f5bd3e6
commit 2fc6e95ec3
9 changed files with 757 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs
View File

@@ -88,8 +88,8 @@ namespace Flax.Deps.Dependencies
Path.Combine(root, "include", "SDL3"),
};
CloneGitRepoFastSince(root, "https://github.com/libsdl-org/SDL", new DateTime(2025, 01, 06));
GitResetToCommit(root, "8ec576ddabdc7edfd68e7a8a3214e84e4026328d");
//CloneGitRepoFastSince(root, "https://github.com/libsdl-org/SDL", new DateTime(2025, 01, 06));
//GitResetToCommit(root, "8ec576ddabdc7edfd68e7a8a3214e84e4026328d");
foreach (var platform in options.Platforms)
{
@@ -135,7 +135,7 @@ namespace Flax.Deps.Dependencies
directoriesToCopy.Add(Path.Combine(buildDir, "include", "SDL3"));
int concurrency = Math.Min(Math.Max(1, (int)(Environment.ProcessorCount * Configuration.ConcurrencyProcessorScale)), Configuration.MaxConcurrency);
RunCmake(root, platform, architecture, $"-B\"{buildDir}\" -DCMAKE_INSTALL_PREFIX=\"{buildDir}\" -DSDL_SHARED={(!buildStatic ? "ON" : "OFF")} -DSDL_STATIC={(buildStatic ? "ON" : "OFF")} -DCMAKE_POSITION_INDEPENDENT_CODE=ON " + string.Join(" ", configs));
RunCmake(root, platform, architecture, $"-B\"{buildDir}\" -DCMAKE_BUILD_TYPE={configuration} -DCMAKE_INSTALL_PREFIX=\"{buildDir}\" -DSDL_SHARED={(!buildStatic ? "ON" : "OFF")} -DSDL_STATIC={(buildStatic ? "ON" : "OFF")} -DCMAKE_POSITION_INDEPENDENT_CODE=ON " + string.Join(" ", configs));
BuildCmake(buildDir, configuration, new Dictionary<string, string>() { {"CMAKE_BUILD_PARALLEL_LEVEL", concurrency.ToString()} });
Utilities.Run("cmake", $"--build . --target install --config {configuration}", null, buildDir, Utilities.RunOptions.DefaultTool);