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

Tweak build

Browse Source
This commit is contained in:
Wojtek Figat
2022-01-09 20:53:20 +01:00
parent 2ca070ea3a
commit 92289fccfd
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_mac.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
git lfs pull
- name: Build
run: |
./Development/Scripts/Mac/CallBuildTool.sh -verbose -build -log -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor
# Game
game-mac:
@@ -31,4 +31,4 @@ jobs:
git lfs pull
- name: Build
run: |
./Development/Scripts/Mac/CallBuildTool.sh -verbose -build -log -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame
./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame

11
Source/Engine/Graphics/Graphics.Build.cs
View File

@@ -48,12 +48,12 @@ public class Graphics : EngineModule
if (VulkanSdk.Instance.IsValid)
options.PrivateDependencies.Add("GraphicsDeviceVulkan");
else
Log.WarningOnce("Building for Windows without Vulkan rendering backend (Vulkan SDK is missing)", ref _logMissingVulkanSDK);
Log.WarningOnce(string.Format("Building for {0} without Vulkan rendering backend (Vulkan SDK is missing)", options.Platform.Target), ref _logMissingVulkanSDK);
var windowsToolchain = options.Toolchain as Flax.Build.Platforms.WindowsToolchain;
if (windowsToolchain != null && windowsToolchain.SDK != Flax.Build.Platforms.WindowsPlatformSDK.v8_1)
options.PrivateDependencies.Add("GraphicsDeviceDX12");
else
Log.WarningOnce("Building for Windows without DirectX 12 rendering backend (Windows 10 SDK is required)", ref _logMissingWindowsSDK);
Log.WarningOnce(string.Format("Building for {0} without Vulkan rendering backend (Vulkan SDK is missing)", options.Platform.Target), ref _logMissingVulkanSDK);
break;
case TargetPlatform.UWP:
options.PrivateDependencies.Add("GraphicsDeviceDX11");
@@ -67,7 +67,7 @@ public class Graphics : EngineModule
if (VulkanSdk.Instance.IsValid)
options.PrivateDependencies.Add("GraphicsDeviceVulkan");
else
Log.WarningOnce("Building for Linux without Vulkan rendering backend (Vulkan SDK is missing)", ref _logMissingVulkanSDK);
Log.WarningOnce(string.Format("Building for {0} without Vulkan rendering backend (Vulkan SDK is missing)", options.Platform.Target), ref _logMissingVulkanSDK);
break;
case TargetPlatform.PS4:
options.PrivateDependencies.Add("GraphicsDevicePS4");
@@ -83,7 +83,10 @@ public class Graphics : EngineModule
break;
case TargetPlatform.Mac:
options.PrivateDependencies.Add("GraphicsDeviceNull");
options.PrivateDependencies.Add("GraphicsDeviceVulkan");
if (VulkanSdk.Instance.IsValid)
options.PrivateDependencies.Add("GraphicsDeviceVulkan");
else
Log.WarningOnce(string.Format("Building for {0} without Vulkan rendering backend (Vulkan SDK is missing)", options.Platform.Target), ref _logMissingVulkanSDK);
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}