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

Fix Editor build on Linux

Browse Source
This commit is contained in:
mafiesto4
2021-01-10 09:46:37 +01:00
parent c7547b3a46
commit ee1b7bad56
5 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Renderer/Editor/LightmapUVsDensity.h
View File

@@ -24,6 +24,9 @@ private:
public:
LightmapUVsDensityMaterialShader();
virtual ~LightmapUVsDensityMaterialShader()
{
}
private:

3
Source/Engine/Renderer/Editor/VertexColors.h
View File

@@ -22,6 +22,9 @@ private:
public:
VertexColorsMaterialShader();
virtual ~VertexColorsMaterialShader()
{
}
private:

8
Source/ThirdParty/glslang/glslang.Build.cs vendored
View File

@@ -24,6 +24,9 @@ public class glslang : DepsModule
base.Setup(options);
var depsRoot = options.DepsFolder;
switch (options.Platform.Target)
{
case TargetPlatform.Windows:
options.OutputFiles.Add(Path.Combine(depsRoot, "GenericCodeGen.lib"));
options.OutputFiles.Add(Path.Combine(depsRoot, "glslang.lib"));
options.OutputFiles.Add(Path.Combine(depsRoot, "HLSL.lib"));
@@ -31,5 +34,10 @@ public class glslang : DepsModule
options.OutputFiles.Add(Path.Combine(depsRoot, "OSDependent.lib"));
options.OutputFiles.Add(Path.Combine(depsRoot, "OGLCompiler.lib"));
options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV.lib"));
break;
case TargetPlatform.Linux:
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}
}
}

8
Source/ThirdParty/spirv-tools/spirv_tools.Build.cs vendored
View File

@@ -25,7 +25,15 @@ public class spirv_tools : DepsModule
base.Setup(options);
var depsRoot = options.DepsFolder;
switch (options.Platform.Target)
{
case TargetPlatform.Windows:
options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools.lib"));
options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools-opt.lib"));
break;
case TargetPlatform.Linux:
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}
}
}

1
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -536,6 +536,7 @@ namespace Flax.Build.Bindings
if (apiType.IsStruct && !apiType.IsPod)
{
// Use wrapper structure that represents the memory layout of the managed data
needLocalVariable = true;
if (!CppUsedNonPodTypes.Contains(apiType))
CppUsedNonPodTypes.Add(apiType);
type = apiType.Name + "Managed";