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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
This commit is contained in:
Wojtek Figat
2023-04-22 18:59:41 +02:00
parent 644eb35b97 73ff053470
commit 390460907d
51 changed files with 1397 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
View File

@@ -49,7 +49,7 @@ namespace Flax.Deps.Dependencies
public override void Build(BuildOptions options)
{
var root = options.IntermediateFolder;
var version = "1.23.0";
var version = "1.23.1";
var dstIncludePath = Path.Combine(options.ThirdPartyFolder, "OpenAL");
foreach (var platform in options.Platforms)

29
Source/Tools/Flax.Build/Platforms/Linux/LinuxPlatform.cs
View File

@@ -42,18 +42,23 @@ namespace Flax.Build.Platforms
// Pick the newest compiler (overriden by specified in command line)
if (Which(Configuration.Compiler) != null)
Compiler = Configuration.Compiler;
else if (Which("clang++-10") != null)
Compiler = "clang++-10";
else if (Which("clang++-9") != null)
Compiler = "clang++-9";
else if (Which("clang++-8") != null)
Compiler = "clang++-8";
else if (Which("clang++-7") != null)
Compiler = "clang++-7";
else if (Which("clang++-6") != null)
Compiler = "clang++-6";
else if (Which("clang++") != null)
Compiler = "clang++";
else
{
for (int ver = 15; ver >= 6; ver--)
{
var compiler = "clang++-" + ver;
if (Which(compiler) != null)
{
Compiler = compiler;
break;
}
}
if (Compiler == null)
{
if (Which("clang++") != null)
Compiler = "clang++";
}
}
}
if (Compiler != null)
{