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

Enable modern Windows dialog boxes

Browse Source
This commit is contained in:
Ari Vuollet
2024-07-07 23:59:00 +03:00
committed by Ari Vuollet
parent 727af5a5b9
commit a69eb4296f
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
View File

@@ -413,6 +413,16 @@ namespace Flax.Build.Platforms
options.CompileEnv.PreprocessorDefinitions.Add("_WINDOWS"); options.CompileEnv.PreprocessorDefinitions.Add("_WINDOWS");
if (Architecture == TargetArchitecture.x64 || Architecture == TargetArchitecture.ARM64) if (Architecture == TargetArchitecture.x64 || Architecture == TargetArchitecture.ARM64)
options.CompileEnv.PreprocessorDefinitions.Add("WIN64"); options.CompileEnv.PreprocessorDefinitions.Add("WIN64");
// Linker may need access to rc.exe for embedding manifests,
// inject the location into PATH of current process so linker can inherit it from it.
if (!string.IsNullOrEmpty(_resourceCompilerPath))
{
string binRootDir = Directory.GetParent(_resourceCompilerPath).FullName;
var path = Environment.GetEnvironmentVariable("PATH");
if (!string.IsNullOrEmpty(_resourceCompilerPath) && !path.Contains(binRootDir))
Environment.SetEnvironmentVariable("PATH", path + ";" + binRootDir);
}
} }
/// <summary> /// <summary>
@@ -849,8 +859,27 @@ namespace Flax.Build.Platforms
} }
else else
{ {
// Don't create Side-by-Side Assembly Manifest // Embed Side-by-Side Assembly Manifest
args.Add("/MANIFEST:NO"); args.Add("/MANIFEST:EMBED");
// Required manifest information for modern visual styles in Windows Common Controls
switch (Architecture)
{
case TargetArchitecture.ARM:
args.Add("\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='arm' publicKeyToken='6595b64144ccf1df' language='*'\"");
break;
case TargetArchitecture.ARM64:
args.Add("\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='arm64' publicKeyToken='6595b64144ccf1df' language='*'\"");
break;
case TargetArchitecture.x86:
args.Add("\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='' publicKeyToken='6595b64144ccf1df' language='*'\"");
break;
case TargetArchitecture.x64:
args.Add("\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"");
break;
default:
break;
}
// Fixed Base Address // Fixed Base Address
args.Add("/FIXED:NO"); args.Add("/FIXED:NO");