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

Merge remote-tracking branch 'upstream/master' into Visject-ConvertConstantToParameter

Browse Source
This commit is contained in:
Nils Hausfeld
2023-10-19 14:03:10 +02:00
parent 3afb6cc88e 6c45141ef9
commit 9bd002ea33
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Editor/Windows/GameCookerWindow.cs
View File

@@ -155,29 +155,42 @@ namespace FlaxEditor.Windows
public virtual void OnNotAvailableLayout(LayoutElementsContainer layout)
{
layout.Label("Missing platform data tools for the target platform.", TextAlignment.Center);
string text = "Missing platform data tools for the target platform.";
if (FlaxEditor.Editor.IsOfficialBuild())
{
switch (BuildPlatform)
{
#if PLATFORM_WINDOWS
case BuildPlatform.Windows32:
case BuildPlatform.Windows64:
case BuildPlatform.UWPx86:
case BuildPlatform.UWPx64:
case BuildPlatform.LinuxX64:
case BuildPlatform.AndroidARM64:
layout.Label("Use Flax Launcher and download the required package.", TextAlignment.Center);
text += "\nUse Flax Launcher and download the required package.";
break;
#endif
default:
layout.Label("Engine source is required to target this platform.", TextAlignment.Center);
text += "\nEngine source is required to target this platform.";
break;
}
}
else
{
var label = layout.Label("To target this platform separate engine source package is required.\nTo get access please contact via https://flaxengine.com/contact", TextAlignment.Center);
label.Label.AutoHeight = true;
text += "\nTo target this platform separate engine source package is required.";
switch (BuildPlatform)
{
case BuildPlatform.XboxOne:
case BuildPlatform.XboxScarlett:
case BuildPlatform.PS4:
case BuildPlatform.PS5:
case BuildPlatform.Switch:
text += "\nTo get access please contact via https://flaxengine.com/contact";
break;
}
}
var label = layout.Label(text, TextAlignment.Center);
label.Label.AutoHeight = true;
}
public virtual void Build()

9
Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
View File

@@ -164,6 +164,15 @@ namespace Flax.Deploy
var defaultEditorConfig = "Development";
var ediotrBinariesPath = Path.Combine(appContentsPath, "Binaries/Editor/Mac", defaultEditorConfig);
Utilities.DirectoryCopy(ediotrBinariesPath, appBinariesPath, true, true);
// Build a disk image
var dmgPath = Path.Combine(Deployer.PackageOutputPath, "FlaxEditor.dmg");
Log.Info("Building disk image...");
if (File.Exists(dmgPath))
File.Delete(dmgPath);
Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\"", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError);
CodeSign(dmgPath);
Log.Info("Output disk image size: " + Utilities.GetFileSize(dmgPath));
}
// Compress

2
Source/Tools/Flax.Build/Projects/VisualStudioCode/VisualStudioCodeProjectGenerator.cs
View File

@@ -172,7 +172,7 @@ namespace Flax.Build.Projects.VisualStudioCode
json.AddField("label", name);
bool isDefaultTask = defaultTask && configuration.Configuration == TargetConfiguration.Development && configuration.Platform == Platform.BuildPlatform.Target;
bool isDefaultTask = defaultTask && configuration.Configuration == TargetConfiguration.Development && configuration.Platform == Platform.BuildPlatform.Target && configuration.Architecture == Platform.BuildTargetArchitecture;
json.BeginObject("group");
{