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

Codestyle fixes

Browse Source
This commit is contained in:
Wojciech Figat
2024-02-19 14:59:02 +01:00
parent ed30cd0238
commit 4c082ef17f
22 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Flax.sln.DotSettings
+4
View File
@@ -73,8 +73,12 @@
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=TYPEDEF/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=TYPEDEF/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CppNaming/UserRules/=UNION_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LO/@EntryIndexedValue">LO</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LO/@EntryIndexedValue">LO</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RPC/@EntryIndexedValue">RPC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SDK/@EntryIndexedValue">SDK</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VS/@EntryIndexedValue">VS</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VS/@EntryIndexedValue">VS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String> <s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
Source/Engine/Level/Level.cs
+5 -1
View File
@@ -109,6 +109,8 @@ namespace FlaxEngine
public static T[] GetScripts<T>() where T : Script public static T[] GetScripts<T>() where T : Script
{ {
var scripts = GetScripts(typeof(T)); var scripts = GetScripts(typeof(T));
if (scripts.Length == 0)
return Array.Empty<T>();
var result = new T[scripts.Length]; var result = new T[scripts.Length];
for (int i = 0; i < scripts.Length; i++) for (int i = 0; i < scripts.Length; i++)
result[i] = scripts[i] as T; result[i] = scripts[i] as T;
@@ -119,11 +121,13 @@ namespace FlaxEngine
/// Finds all the actors of the given type in all the loaded scenes. /// Finds all the actors of the given type in all the loaded scenes.
/// </summary> /// </summary>
/// <typeparam name="T">Type of the object.</typeparam> /// <typeparam name="T">Type of the object.</typeparam>
/// <typeparam name="activeOnly">Finds only active actors.</typeparam> /// <param name="activeOnly">Finds only active actors.</param>
/// <returns>Found actors list.</returns> /// <returns>Found actors list.</returns>
public static T[] GetActors<T>(bool activeOnly = false) where T : Actor public static T[] GetActors<T>(bool activeOnly = false) where T : Actor
{ {
var actors = GetActors(typeof(T), activeOnly); var actors = GetActors(typeof(T), activeOnly);
if (actors.Length == 0)
return Array.Empty<T>();
var result = new T[actors.Length]; var result = new T[actors.Length];
for (int i = 0; i < actors.Length; i++) for (int i = 0; i < actors.Length; i++)
result[i] = actors[i] as T; result[i] = actors[i] as T;
Source/Tools/Flax.Build/Build/FileCache.cs
+7 -9
View File
@@ -9,32 +9,30 @@ namespace Flax.Build
/// </summary> /// </summary>
public static class FileCache public static class FileCache
{ {
private static Dictionary<string, FileInfo> fileInfoCache = new Dictionary<string, FileInfo>(); private static readonly Dictionary<string, FileInfo> _cache = new();
public static void FileRemoveFromCache(string path) public static void FileRemoveFromCache(string path)
{ {
//fileInfoCache[path].Refresh(); _cache.Remove(path);
fileInfoCache.Remove(path);
} }
public static bool Exists(string path) public static bool Exists(string path)
{ {
if (fileInfoCache.TryGetValue(path, out var fileInfo)) if (_cache.TryGetValue(path, out var fileInfo))
return fileInfo.Exists; return fileInfo.Exists;
fileInfo = new FileInfo(path); fileInfo = new FileInfo(path);
fileInfoCache.Add(path, fileInfo); _cache.Add(path, fileInfo);
return fileInfo.Exists; return fileInfo.Exists;
} }
public static DateTime GetLastWriteTime(string path) public static DateTime GetLastWriteTime(string path)
{ {
if (_cache.TryGetValue(path, out var fileInfo))
if (fileInfoCache.TryGetValue(path, out var fileInfo))
return fileInfo.LastWriteTime; return fileInfo.LastWriteTime;
fileInfo = new FileInfo(path); fileInfo = new FileInfo(path);
fileInfoCache.Add(path, fileInfo); _cache.Add(path, fileInfo);
return fileInfo.LastWriteTime; return fileInfo.LastWriteTime;
} }
} }
Source/Tools/Flax.Build/Build/NativeCpp/Builder.NativeCpp.cs
+4 -4
View File
@@ -808,11 +808,11 @@ namespace Flax.Build
foreach (var moduleName in moduleOptions.PrivateDependencies.Concat(moduleOptions.PublicDependencies)) foreach (var moduleName in moduleOptions.PrivateDependencies.Concat(moduleOptions.PublicDependencies))
{ {
var dependencyModule = buildData.Rules.GetModule(moduleName); var dependencyModule = buildData.Rules.GetModule(moduleName);
if (dependencyModule != null && if (dependencyModule != null &&
!string.IsNullOrEmpty(dependencyModule.BinaryModuleName) && !string.IsNullOrEmpty(dependencyModule.BinaryModuleName) &&
dependencyModule.BinaryModuleName != binaryModule.Key && dependencyModule.BinaryModuleName != binaryModule.Key &&
!moduleNamesUsed.Contains(dependencyModule.BinaryModuleName) && !moduleNamesUsed.Contains(dependencyModule.BinaryModuleName) &&
GetModuleProject(dependencyModule, project) != null && GetModuleProject(dependencyModule, project) != null &&
buildData.Modules.TryGetValue(dependencyModule, out var dependencyOptions)) buildData.Modules.TryGetValue(dependencyModule, out var dependencyOptions))
{ {
// Import symbols from referenced binary module // Import symbols from referenced binary module
Source/Tools/Flax.Build/Build/Platform.cs
+7 -14
View File
@@ -77,14 +77,10 @@ namespace Flax.Build
var architectureId = RuntimeInformation.ProcessArchitecture; var architectureId = RuntimeInformation.ProcessArchitecture;
switch (architectureId) switch (architectureId)
{ {
case Architecture.X86: case Architecture.X86: return TargetArchitecture.x86;
return TargetArchitecture.x86; case Architecture.X64: return TargetArchitecture.x64;
case Architecture.X64: case Architecture.Arm: return TargetArchitecture.ARM;
return TargetArchitecture.x64; case Architecture.Arm64: return TargetArchitecture.ARM64;
case Architecture.Arm:
return TargetArchitecture.ARM;
case Architecture.Arm64:
return TargetArchitecture.ARM64;
default: throw new NotImplementedException(string.Format("Unsupported build platform {0}.", architectureId)); default: throw new NotImplementedException(string.Format("Unsupported build platform {0}.", architectureId));
} }
} }
@@ -290,12 +286,9 @@ namespace Flax.Build
var subdir = "Binaries/Editor/"; var subdir = "Binaries/Editor/";
switch (Platform.BuildTargetPlatform) switch (Platform.BuildTargetPlatform)
{ {
case TargetPlatform.Windows: case TargetPlatform.Windows: return subdir + "Win64";
return subdir + "Win64"; case TargetPlatform.Linux: return subdir + "Linux";
case TargetPlatform.Linux: case TargetPlatform.Mac: return subdir + "Mac";
return subdir + "Linux";
case TargetPlatform.Mac:
return subdir + "Mac";
} }
throw new NotImplementedException(); throw new NotImplementedException();
} }
Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Flax.Deploy
DeployFile(src, dst, buildToolExe); DeployFile(src, dst, buildToolExe);
CodeSign(Path.Combine(dst, buildToolExe)); CodeSign(Path.Combine(dst, buildToolExe));
var buildToolDll = "Flax.Build.dll"; var buildToolDll = "Flax.Build.dll";
DeployFile(src, dst,buildToolDll); DeployFile(src, dst, buildToolDll);
CodeSign(Path.Combine(dst, buildToolDll)); CodeSign(Path.Combine(dst, buildToolDll));
DeployFile(src, dst, "Flax.Build.xml", true); DeployFile(src, dst, "Flax.Build.xml", true);
DeployFile(src, dst, "Flax.Build.pdb"); DeployFile(src, dst, "Flax.Build.pdb");
Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs
+1 -1
View File
@@ -128,7 +128,7 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
RunCmake(root, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + globalConfig); RunCmake(root, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + globalConfig);
Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError); Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError);
Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs
+4 -4
View File
@@ -49,7 +49,7 @@ namespace Flax.Deps.Dependencies
} }
} }
} }
/// <inheritdoc /> /// <inheritdoc />
public override void Build(BuildOptions options) public override void Build(BuildOptions options)
{ {
@@ -185,16 +185,16 @@ namespace Flax.Deps.Dependencies
// Print the NvCloth version // Print the NvCloth version
Log.Info($"Building {File.ReadAllLines(Path.Combine(root, "README.md"))[0].Trim()} to {platform} {architecture}"); Log.Info($"Building {File.ReadAllLines(Path.Combine(root, "README.md"))[0].Trim()} to {platform} {architecture}");
// Generate project files // Generate project files
SetupDirectory(buildFolder, false); SetupDirectory(buildFolder, false);
Utilities.FileDelete(Path.Combine(cmakeFolder, "CMakeCache.txt")); Utilities.FileDelete(Path.Combine(cmakeFolder, "CMakeCache.txt"));
cmakeArgs += $" -DPX_STATIC_LIBRARIES=1 -DPX_OUTPUT_DLL_DIR=\"{Path.Combine(buildFolder, "bin")}\" -DPX_OUTPUT_LIB_DIR=\"{Path.Combine(buildFolder, "lib")}\" -DPX_OUTPUT_EXE_DIR=\"{Path.Combine(buildFolder, "bin")}\""; cmakeArgs += $" -DPX_STATIC_LIBRARIES=1 -DPX_OUTPUT_DLL_DIR=\"{Path.Combine(buildFolder, "bin")}\" -DPX_OUTPUT_LIB_DIR=\"{Path.Combine(buildFolder, "lib")}\" -DPX_OUTPUT_EXE_DIR=\"{Path.Combine(buildFolder, "bin")}\"";
RunCmake(cmakeFolder, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + cmakeArgs, envVars); RunCmake(cmakeFolder, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + cmakeArgs, envVars);
// Run build // Run build
Utilities.Run("cmake", "--build . --config Release", null, cmakeFolder, Utilities.RunOptions.ThrowExceptionOnError, envVars); Utilities.Run("cmake", "--build . --config Release", null, cmakeFolder, Utilities.RunOptions.ThrowExceptionOnError, envVars);
// Deploy binaries // Deploy binaries
var libs = new[] var libs = new[]
{ {
Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
+1 -1
View File
@@ -172,7 +172,7 @@ namespace Flax.Deps.Dependencies
var buildDir = Path.Combine(root, "build"); var buildDir = Path.Combine(root, "build");
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
SetupDirectory(buildDir, true); SetupDirectory(buildDir, true);
RunCmake(buildDir, platform, architecture, ".. -DLIBTYPE=STATIC -DCMAKE_BUILD_TYPE=Release " + config); RunCmake(buildDir, platform, architecture, ".. -DLIBTYPE=STATIC -DCMAKE_BUILD_TYPE=Release " + config);
Source/Tools/Flax.Build/Deps/Dependencies/curl.cs
+4 -4
View File
@@ -95,7 +95,7 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Linux: case TargetPlatform.Linux:
{ {
// Build for Linux // Build for Linux
var settings = new [] var settings = new[]
{ {
"--without-librtmp", "--without-librtmp",
"--without-ssl", "--without-ssl",
@@ -126,7 +126,7 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
// Build for Mac // Build for Mac
var settings = new [] var settings = new[]
{ {
"--with-secure-transport", "--with-secure-transport",
"--without-librtmp", "--without-librtmp",
@@ -137,7 +137,7 @@ namespace Flax.Deps.Dependencies
"--enable-static", "--enable-static",
"-disable-ldap --disable-sspi --disable-ftp --disable-file --disable-dict --disable-telnet --disable-tftp --disable-rtsp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-smb", "-disable-ldap --disable-sspi --disable-ftp --disable-file --disable-dict --disable-telnet --disable-tftp --disable-rtsp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-smb",
}; };
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
var arch = GetAppleArchName(architecture); var arch = GetAppleArchName(architecture);
var archName = arch + "-apple-darwin19"; var archName = arch + "-apple-darwin19";
@@ -146,7 +146,7 @@ namespace Flax.Deps.Dependencies
var compilerFlags = string.Format("-mmacosx-version-min={0} -arch {1}", Configuration.MacOSXMinVer, arch); var compilerFlags = string.Format("-mmacosx-version-min={0} -arch {1}", Configuration.MacOSXMinVer, arch);
var envVars = new Dictionary<string, string> var envVars = new Dictionary<string, string>
{ {
{ "CC", "clang" }, { "CC", "clang" },
{ "CXX", "clang" }, { "CXX", "clang" },
{ "CFLAGS", compilerFlags }, { "CFLAGS", compilerFlags },
{ "CXXFLAGS", compilerFlags }, { "CXXFLAGS", compilerFlags },
Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs
+1 -1
View File
@@ -247,7 +247,7 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
SetupDirectory(buildDir, true); SetupDirectory(buildDir, true);
RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release"); RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release");
Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs
+1 -1
View File
@@ -130,7 +130,7 @@ namespace Flax.Deps.Dependencies
}; };
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
RunCmake(root, platform, architecture, cmakeArgs); RunCmake(root, platform, architecture, cmakeArgs);
Utilities.Run("cmake", string.Format("--build . --config {0} --target install", configuration), null, buildDir, Utilities.RunOptions.None); Utilities.Run("cmake", string.Format("--build . --config {0} --target install", configuration), null, buildDir, Utilities.RunOptions.None);
Source/Tools/Flax.Build/Deps/Dependencies/ogg.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Mac: case TargetPlatform.Mac:
{ {
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
SetupDirectory(buildDir, true); SetupDirectory(buildDir, true);
RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release"); RunCmake(buildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release");
Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs
+1 -1
View File
@@ -376,7 +376,7 @@ namespace Flax.Deps.Dependencies
GitCheckout(oggRoot, "master", "4380566a44b8d5e85ad511c9c17eb04197863ec5"); GitCheckout(oggRoot, "master", "4380566a44b8d5e85ad511c9c17eb04197863ec5");
// Build for Mac // Build for Mac
foreach (var architecture in new []{ TargetArchitecture.x64, TargetArchitecture.ARM64 }) foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 })
{ {
SetupDirectory(oggBuildDir, true); SetupDirectory(oggBuildDir, true);
RunCmake(oggBuildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=\"../install\""); RunCmake(oggBuildDir, platform, architecture, ".. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=\"../install\"");
Source/Tools/Flax.Build/Deps/Downloader.cs
+1 -2
View File
@@ -105,8 +105,7 @@ namespace Flax.Deps
if (totalBytes.HasValue) if (totalBytes.HasValue)
progress.Update(totalBytesRead, totalBytes.Value); progress.Update(totalBytesRead, totalBytes.Value);
} }
} } while (hasMoreToRead);
while (hasMoreToRead);
} }
} }
} }
Source/Tools/Flax.Build/Deps/ProgressDisplay.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace Flax.Deps
Console.WriteLine(); Console.WriteLine();
return false; return false;
} }
return true; return true;
*/ */
} }
Source/Tools/Flax.Build/Platforms/Android/AndroidSdk.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Flax.Build.Platforms
public static readonly AndroidSdk Instance = new AndroidSdk(); public static readonly AndroidSdk Instance = new AndroidSdk();
/// <inheritdoc /> /// <inheritdoc />
public override TargetPlatform[] Platforms => new [] public override TargetPlatform[] Platforms => new[]
{ {
TargetPlatform.Windows, TargetPlatform.Windows,
TargetPlatform.Linux, TargetPlatform.Linux,
Source/Tools/Flax.Build/Platforms/Mac/MacPlatform.cs
+8 -8
View File
@@ -77,15 +77,15 @@ namespace Flax.Build.Platforms
/// Returns true if running an x64 binary an arm64 host machine. /// Returns true if running an x64 binary an arm64 host machine.
/// </summary> /// </summary>
public unsafe static bool GetProcessIsTranslated() public unsafe static bool GetProcessIsTranslated()
{ {
int ret = 0; int ret = 0;
ulong size = sizeof(int); ulong size = sizeof(int);
if (sysctlbyname("sysctl.proc_translated", &ret, &size, null, 0) == -1) if (sysctlbyname("sysctl.proc_translated", &ret, &size, null, 0) == -1)
return false; return false;
return ret != 0; return ret != 0;
} }
[DllImport("c")] [DllImport("c")]
private static unsafe extern int sysctlbyname(string name, void* oldp, ulong* oldlenp, void* newp, ulong newlen); private static unsafe extern int sysctlbyname(string name, void* oldp, ulong* oldlenp, void* newp, ulong newlen);
} }
} }
Source/Tools/Flax.Build/Projects/VisualStudio/VisualStudioProjectGenerator.cs
+1 -1
View File
@@ -702,7 +702,7 @@ namespace Flax.Build.Projects.VisualStudio
{ {
// Build command for the build tool // Build command for the build tool
var buildToolPath = Path.ChangeExtension(typeof(Builder).Assembly.Location, null); var buildToolPath = Path.ChangeExtension(typeof(Builder).Assembly.Location, null);
var targetsFileContent = new StringBuilder(); var targetsFileContent = new StringBuilder();
targetsFileContent.AppendLine("<Project>"); targetsFileContent.AppendLine("<Project>");
targetsFileContent.AppendLine(" <!-- Custom Flax.Build scripts for C# projects. -->"); targetsFileContent.AppendLine(" <!-- Custom Flax.Build scripts for C# projects. -->");
Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
+2 -3
View File
@@ -410,8 +410,7 @@ namespace Flax.Build.Projects.VisualStudioCode
json.AddField("stopAtEntry", false); json.AddField("stopAtEntry", false);
json.AddField("externalConsole", true); json.AddField("externalConsole", true);
break; break;
case TargetPlatform.Linux: case TargetPlatform.Linux: break;
break;
} }
} }
json.EndObject(); json.EndObject();
@@ -622,7 +621,7 @@ namespace Flax.Build.Projects.VisualStudioCode
json.AddField("**/Output", true); json.AddField("**/Output", true);
json.AddField("**/*.flax", true); json.AddField("**/*.flax", true);
json.EndObject(); json.EndObject();
// Extension settings // Extension settings
json.AddField("omnisharp.useModernNet", true); json.AddField("omnisharp.useModernNet", true);
Source/Tools/Flax.Build/Utilities/CppNameMangling.cs
+1 -2
View File
@@ -79,8 +79,7 @@ namespace Flax.Build
} }
} }
break; break;
default: default: throw new InvalidPlatformException(buildData.Platform.Target);
throw new InvalidPlatformException(buildData.Platform.Target);
} }
var result = sb.ToString(); var result = sb.ToString();
BindingsGenerator.PutStringBuilder(sb); BindingsGenerator.PutStringBuilder(sb);
Source/Tools/Flax.Build/Utilities/WinAPI.cs
+1 -1
View File
@@ -130,7 +130,7 @@ namespace Flax.Build
System = 0x00001000, System = 0x00001000,
Task = 0x00002000 Task = 0x00002000
} }
public enum Icon : uint public enum Icon : uint
{ {
Warning = 0x00000030, Warning = 0x00000030,