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

Merge remote-tracking branch 'origin/1.7' into 1.7

Browse Source
This commit is contained in:
Wojtek Figat
2023-07-16 12:03:06 +02:00
parent 31943ca9bd 1ae89c7545
commit 371db610a9
8 changed files with 133 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs
View File

@@ -82,6 +82,13 @@ namespace Flax.Deps.Dependencies
case TargetPlatform.Android:
Build(options, platform, TargetArchitecture.ARM64);
break;
case TargetPlatform.Mac:
Build(options, platform, TargetArchitecture.x64);
Build(options, platform, TargetArchitecture.ARM64);
break;
case TargetPlatform.iOS:
Build(options, platform, TargetArchitecture.ARM64);
break;
}
}
@@ -140,6 +147,16 @@ namespace Flax.Deps.Dependencies
envVars.Add("PM_ANDROIDNDK_PATH", AndroidNdk.Instance.RootPath);
}
break;
case TargetPlatform.Mac:
cmakeArgs += " -DTARGET_BUILD_PLATFORM=mac";
cmakeName = "mac";
binariesPrefix = "lib";
break;
case TargetPlatform.iOS:
cmakeArgs += " -DTARGET_BUILD_PLATFORM=ios";
cmakeName = "ios";
binariesPrefix = "lib";
break;
default: throw new InvalidPlatformException(platform);
}
var cmakeFolder = Path.Combine(nvCloth, "compiler", "cmake", cmakeName);