Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix compiler warnings on macOS

Browse Source
This commit is contained in:
Wojciech Figat
2026-04-05 13:02:01 +02:00
parent 4e6fde17ea
commit 1d214b20e4
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Platforms/Mac/Binaries/ThirdParty/ARM64/libastcenc.a
LFS Vendored
BIN
View File
Binary file not shown.
Source/ThirdParty/tracy/common/TracySystem.cpp
Vendored
+5
View File
@@ -58,6 +58,11 @@ extern "C" typedef HRESULT (WINAPI *t_GetThreadDescription)( HANDLE, PWSTR* );
#endif #endif
#endif #endif
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
namespace tracy namespace tracy
{ {
Source/Tools/Flax.Build/Deps/Dependencies/astc.cs
+5 -2
View File
@@ -66,6 +66,9 @@ namespace Flax.Deps.Dependencies
var commit = "aeece2f609db959d1c5e43e4f00bd177ea130575"; // 4.6.1 var commit = "aeece2f609db959d1c5e43e4f00bd177ea130575"; // 4.6.1
CloneGitRepo(root, "https://github.com/ARM-software/astc-encoder.git", commit); CloneGitRepo(root, "https://github.com/ARM-software/astc-encoder.git", commit);
// Fix compilation on macOS
Utilities.ReplaceInFile(Path.Combine(root, "Source/cmake_core.cmake"), "-ffp-model=precise", "");
foreach (var platform in options.Platforms) foreach (var platform in options.Platforms)
{ {
foreach (var architecture in options.Architectures) foreach (var architecture in options.Architectures)
@@ -84,14 +87,14 @@ namespace Flax.Deps.Dependencies
var depsFolder = GetThirdPartyFolder(options, platform, architecture); var depsFolder = GetThirdPartyFolder(options, platform, architecture);
Utilities.FileCopy(Path.Combine(buildDir, "Source/Release", lib), Path.Combine(depsFolder, "astcenc.lib")); Utilities.FileCopy(Path.Combine(buildDir, "Source/Release", lib), Path.Combine(depsFolder, "astcenc.lib"));
break; break;
} }
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
string buildDir = Path.Combine(root, "build-" + architecture); string buildDir = Path.Combine(root, "build-" + architecture);
var isa = architecture == TargetArchitecture.ARM64 ? "-DASTCENC_ISA_NEON=ON" : "-DASTCENC_ISA_SSE2=ON"; var isa = architecture == TargetArchitecture.ARM64 ? "-DASTCENC_ISA_NEON=ON" : "-DASTCENC_ISA_SSE2=ON";
var lib = architecture == TargetArchitecture.ARM64 ? "libastcenc-neon-static.a" : "libastcenc-sse2-static.a"; var lib = architecture == TargetArchitecture.ARM64 ? "libastcenc-neon-static.a" : "libastcenc-sse2-static.a";
SetupDirectory(buildDir, true); SetupDirectory(buildDir, true);
RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_UNIVERSAL_BINARY=OFF " + isa); RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release -DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_UNIVERSAL_BINARY=OFF -DASTCENC_INVARIANCE=OFF " + isa);
BuildCmake(buildDir); BuildCmake(buildDir);
var depsFolder = GetThirdPartyFolder(options, platform, architecture); var depsFolder = GetThirdPartyFolder(options, platform, architecture);
Utilities.FileCopy(Path.Combine(buildDir, "Source", lib), Path.Combine(depsFolder, "libastcenc.a")); Utilities.FileCopy(Path.Combine(buildDir, "Source", lib), Path.Combine(depsFolder, "libastcenc.a"));