Fixes for building editor for Linux

This commit is contained in:
mafiesto4
2020-12-23 21:54:21 +01:00
parent 429b71b63f
commit e4936547e3
11 changed files with 331 additions and 309 deletions

View File

@@ -49,8 +49,17 @@ public class ModelTool : EngineModule
options.PrivateDependencies.Add("TextureTool");
options.PrivateDefinitions.Add("COMPILE_WITH_ASSETS_IMPORTER");
options.PrivateDependencies.Add("DirectXMesh");
options.PrivateDependencies.Add("UVAtlas");
switch (options.Platform.Target)
{
case TargetPlatform.Windows:
options.PrivateDependencies.Add("DirectXMesh");
options.PrivateDependencies.Add("UVAtlas");
break;
case TargetPlatform.Linux:
break;
default: throw new InvalidPlatformException(options.Platform.Target);
}
options.PrivateDependencies.Add("meshoptimizer");
options.PublicDefinitions.Add("COMPILE_WITH_MODEL_TOOL");

View File

@@ -257,7 +257,7 @@ void OptimizeCurve(LinearCurve<T>& curve)
{
auto& oldKeyframes = curve.GetKeyframes();
const int32 keyCount = oldKeyframes.Count();
LinearCurve<T>::KeyFrameCollection newKeyframes(keyCount);
typename LinearCurve<T>::KeyFrameCollection newKeyframes(keyCount);
bool lastWasEqual = false;
for (int32 i = 0; i < keyCount; i++)