diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libGenericCodeGen.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libGenericCodeGen.a index 1a8237027..c5745f338 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libGenericCodeGen.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libGenericCodeGen.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c6add4697d7513883ea5583587a50b3b01ff0156d06e2ccc48070e23c415bf4 -size 31902 +oid sha256:794ce94a3f89c080a59889c7d49f98a5e3ce004c8c5fea533370e6dc9a388396 +size 30214 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libHLSL.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libHLSL.a index 3ce822729..5e9764557 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libHLSL.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libHLSL.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:254756fe20ea96e73bd82a9a491c1f18c852aae33dd8bf9d6648c91d0247c7eb +oid sha256:0fd14ac5c4b03136ad2734a3b866c6524cf817afa1e6294c8f1408cac44f5b24 size 1068 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libMachineIndependent.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libMachineIndependent.a index 0235bd398..56ac04634 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libMachineIndependent.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libMachineIndependent.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9e79710c30285e0c5e4fe2ff1e9c47d06d9457428c177c6580e1ec8966dd079 -size 5287654 +oid sha256:1d3af5ec52f4d1aa80ed28e41a40bd53f3162f2c42965e162a0fca8329d479a6 +size 5370940 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libNvCloth.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libNvCloth.a index 573dfb245..51e71d359 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libNvCloth.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libNvCloth.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6234ee8e0cea08be467f8d13994fee8b94dfa2ed2147460a3268dbe6cfeb87a6 -size 553518 +oid sha256:62687b3036959f1b873623202dbfef3706c154ceb3fa26e87dea6702d9bab657 +size 553390 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOGLCompiler.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOGLCompiler.a index 7ac2e3cc5..ca8f14082 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOGLCompiler.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOGLCompiler.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b78a2a48c4c17a066164b7d151260d836e01ddb0d4087f25a6266aafc220eb5 -size 3332 +oid sha256:90b0951e9d0fcbcd63d53c60981d342bcd5d3c40f04983ee281fb45821f84ab0 +size 3308 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOSDependent.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOSDependent.a index ce233ff4f..b9dad7646 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOSDependent.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libOSDependent.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67afb8e80b768c785905821f4ab4e4491598ab3a69f3fd514d4a9dadf6f80d36 -size 4966 +oid sha256:c5725e2cfe85e4c8a03f407562098306d3d1cc6715c4349288433cde0efcceb2 +size 4918 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCharacterKinematic_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCharacterKinematic_static_64.a index 98a4a8286..7e702f665 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCharacterKinematic_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCharacterKinematic_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9cf1125a7e1d0f2fb1a12b6f04537228cd37e3322cf818696a2d3446f97b953 -size 278626 +oid sha256:9929fabaa9ca418b8e48ea1081652fa61180fe0bec0518f5603966f6b4918e5c +size 278562 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCommon_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCommon_static_64.a index 242c33ca5..6b596b38b 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCommon_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCommon_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19d0245e6dce80bb596ed10a154a5e18a5902df6c3e95c087e856fa6ca25f6f6 -size 4596892 +oid sha256:8b8f2a44b37ac65ea3eaee9ad090f471be3848490017d06980e6224b443a2218 +size 4595548 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCooking_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCooking_static_64.a index e7d99ad1f..851680c01 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCooking_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXCooking_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d44653d8526acb4fd631cf007941a656ab054552b9406cf54199abf7bfab98c +oid sha256:a1126331d2ba6933b1fa70d8d735c766e67785d58c243d960d6c0225f207bdf3 size 28284 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXExtensions_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXExtensions_static_64.a index 150fe2099..5b547830d 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXExtensions_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXExtensions_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0667c4d6515bb6c95c9ce5072edc56da7da45b6691eba2d3332f6b1db27c7511 -size 4081244 +oid sha256:d516b0b54861a86ed413f7a0e3358d8ea74952b5ef84871332453f758f0d8920 +size 4081602 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXFoundation_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXFoundation_static_64.a index 94622de79..8d0a04c50 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXFoundation_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXFoundation_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db06448b20f3d0b14780730e7e884cb18be4b546dc228b84c0ad8d33b088dcd4 -size 121148 +oid sha256:ee3df94bba27db3a77864816c460c76f82c58a98fd1b3055554fb773232b3fef +size 121028 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXPvdSDK_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXPvdSDK_static_64.a index e49794ebc..c22a96c31 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXPvdSDK_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXPvdSDK_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:419c688357cf3c4b781fa3cae601906be8e46d1de9d1238f8acb482166b5f837 -size 503210 +oid sha256:c22c955f6cf0d5b55033d0acdcae44b6e17e07eaaec884fa5ad80dcef8ddc15d +size 503146 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle2_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle2_static_64.a index 2da3cad95..5163432ac 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle2_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle2_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5559f869db603d979003f6d8d3d35179db5193974f39481bc2ee821af27faf3 -size 195454 +oid sha256:12d23592318c74bd3d5aed5134bf8be50fa32c78e66e59236d25620aed7316e9 +size 195302 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle_static_64.a index abcca2a9a..488e90c95 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysXVehicle_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:427613612343bd0ea40d523ea0c7458a6ed927357fe4a277428d4ee0228bad95 -size 1209552 +oid sha256:bd1af110b345dc5548cf07885ea4f0e95bd8f83b4f9c041bfc962a6e72d8cc71 +size 1209456 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysX_static_64.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysX_static_64.a index 12db8e2e6..c4e817356 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysX_static_64.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libPhysX_static_64.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b606e398be2f9772da1c0dd0f1b9aead20974cf03eeaa7a2df1a477eb6caff9 -size 6360866 +oid sha256:7d2e9591a28c5d0bf0aee830e340c6e9a1e978aa7f80cdbda002c5fa1fac7196 +size 6359770 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools-opt.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools-opt.a index 5c0736d35..fca25c5e9 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools-opt.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools-opt.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d101fdbbdb514937ef3ccdbb2a0791542fdb880b0331a59599e1cab3fdaba8d0 -size 8949560 +oid sha256:5205664eaa07b9161d5c9daa4ca7a2e224a7e8d082d13390bd3743e7cd9937cf +size 8105308 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools.a index 3732827d0..7f73d4824 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV-Tools.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dafaa04b6d0896fdb33738ea7104fa47ad150f287d046bd752d7f343efb6bc1a -size 2515558 +oid sha256:17699265b59441501b4837cef88d6f82d7404201f2d05cf2eb35e083b4b63c14 +size 2394830 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV.a index 2c9b04e3d..622011e31 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libSPIRV.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e8ee83a8a956e1e700aa5599107a5710d9c17f350a7d9025765b588146272c7 -size 1057884 +oid sha256:e5bdbd77d71f37080617b261aa92b589ea62a2bc0e567755367733535ddf9d60 +size 1071492 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a index 92b3c5545..dd916929d 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libassimp.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3510d6c5585f08fc9fcbf2044bb0dc0238e2501c1914e3b98aef36bc8cd2711 -size 10303430 +oid sha256:d9e8469042e4734543f142f9559347bd1e36bc897b8962ae4f58fcec985e70ba +size 10261802 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libcurl.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libcurl.a index f722e3a16..f08214054 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libcurl.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libcurl.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b7f66f58d5e7dabe0a0ec7e01ae5dd3683c2ae474ac6dbc133393b2be715bbf -size 574086 +oid sha256:ab21e8f683649d34388dbdddafb33ac4ba152e0e0fb1d631e03641e3bfc484c3 +size 767214 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libfreetype.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libfreetype.a index 5d8a644ec..a77930866 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libfreetype.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libfreetype.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:678c906be4431bbf7b1a5e915e587f0e1f4f0c14cd2dc30a90e44e669d7f690c -size 1123598 +oid sha256:0885cd644e330c5b622e1312395125c2f14ac78deaf9ca58b66fdcfa074d28bb +size 1136190 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libglslang.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libglslang.a index 0e82c48ea..9f830b8e1 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libglslang.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libglslang.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f1fad7d2bc3a7768ea1e8a075315c371064cfd5cfcc64f9d4a55837e304b3a -size 32314 +oid sha256:9a1f4379e8262064813ab001df54d5759077d5c19191ad464374a07073d7db8e +size 34130 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libopenal.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libopenal.a index 2a0348bcd..b88eb07e6 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libopenal.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libopenal.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:762b5fd6fe17dc4a99fd49488b32486e6744aef278a44c9843bdda05972e1287 -size 1565506 +oid sha256:3e51434c5af3558b73ced5051a239b33077bce527d25e5c71602e7b27b65c80c +size 3506588 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbis.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbis.a index 0feb18fa5..c606738e6 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbis.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbis.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3257e82c3740aec7b15d065ef0b89064b971f77db4251c220fd277b3a96ac19d -size 294326 +oid sha256:fdc79150a98f6f589d5a339dc50e4ad628f92767aa194c8ac4a202ebd78cec1d +size 296926 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisenc.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisenc.a index 59ef26a02..1fc00718c 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisenc.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisenc.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50c8f8977fece27302c967c7d65b4a64b1c07f538b54edb0852169bba0bca91b -size 778766 +oid sha256:6d8cbdad00f1a7f0a59f500d6687a64fbcdfc3db7c3acc05a65f68b7ea6566cb +size 782150 diff --git a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisfile.a b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisfile.a index 9e6ebdd68..41abc9b37 100644 --- a/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisfile.a +++ b/Source/Platforms/Linux/Binaries/ThirdParty/x64/libvorbisfile.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc394079fd2b794b637e879357494d0db3e1a8e9690949d7708766ccf360d5eb -size 38204 +oid sha256:1b8377b841a4a871487ff0f591970ada56306087b1f4e3f09a8fb457f6811ac4 +size 38804 diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs index f72928bf8..bb1c4fa3c 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs @@ -127,11 +127,12 @@ namespace Flax.Deps.Dependencies { "CC", "clang-" + Configuration.LinuxClangMinVer }, { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }, { "CXX", "clang++-" + Configuration.LinuxClangMinVer }, + { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel }, }; // Build for Linux RunCmake(root, platform, TargetArchitecture.x64, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + globalConfig, envVars); - Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run("make", null, null, root, Utilities.RunOptions.DefaultTool, envVars); configHeaderFilePath = Path.Combine(root, "include", "assimp", "config.h"); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); Utilities.FileCopy(Path.Combine(root, "lib", "libassimp.a"), Path.Combine(depsFolder, "libassimp.a")); @@ -143,11 +144,11 @@ namespace Flax.Deps.Dependencies foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 }) { RunCmake(root, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + globalConfig); - Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("make", null, null, root, Utilities.RunOptions.DefaultTool); configHeaderFilePath = Path.Combine(root, "include", "assimp", "config.h"); var depsFolder = GetThirdPartyFolder(options, platform, architecture); Utilities.FileCopy(Path.Combine(root, "lib", "libassimp.a"), Path.Combine(depsFolder, "libassimp.a")); - Utilities.Run("make", "clean", null, root, Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("make", "clean", null, root, Utilities.RunOptions.DefaultTool); } break; } diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs b/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs index 699e40f72..1120a94f8 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs @@ -115,6 +115,7 @@ namespace Flax.Deps.Dependencies var buildFolder = Path.Combine(nvCloth, "compiler", platform.ToString() + '_' + architecture.ToString()); var envVars = new Dictionary(); envVars["GW_DEPS_ROOT"] = root; + envVars["CMAKE_BUILD_PARALLEL_LEVEL"] = CmakeBuildParallel; switch (platform) { case TargetPlatform.Windows: @@ -166,6 +167,8 @@ namespace Flax.Deps.Dependencies cmakeArgs += " -DTARGET_BUILD_PLATFORM=linux"; cmakeName = "linux"; binariesPrefix = "lib"; + envVars.Add("CC", "clang-" + Configuration.LinuxClangMinVer); + envVars.Add("CXX", "clang++-" + Configuration.LinuxClangMinVer); break; default: throw new InvalidPlatformException(platform); } diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs b/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs index 034b2a4b8..319ad70b3 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs @@ -123,6 +123,7 @@ namespace Flax.Deps.Dependencies { { "CC", "clang-" + Configuration.LinuxClangMinVer }, { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }, + { "CXX", "clang++-" + Configuration.LinuxClangMinVer }, { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel }, }; var config = $"-DALSOFT_REQUIRE_ALSA=ON " + diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs index 32e2d2f38..39f7ad975 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs @@ -238,6 +238,8 @@ namespace Flax.Deps.Dependencies case TargetPlatform.Linux: envVars.Add("CC", "clang-" + Configuration.LinuxClangMinVer); envVars.Add("CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer); + envVars.Add("CXX", "clang++-" + Configuration.LinuxClangMinVer); + envVars.Add("CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel); break; case TargetPlatform.Mac: break; default: throw new InvalidPlatformException(BuildPlatform); @@ -258,7 +260,7 @@ namespace Flax.Deps.Dependencies Log.Info("Building PhysX version " + File.ReadAllText(Path.Combine(root, "physx", "version.txt")) + " to " + binariesSubDir); // Generate project files - Utilities.Run(projectGenPath, preset, null, projectGenDir, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run(projectGenPath, preset, null, projectGenDir, Utilities.RunOptions.DefaultTool, envVars); switch (targetPlatform) { @@ -304,10 +306,10 @@ namespace Flax.Deps.Dependencies } break; case TargetPlatform.Linux: - Utilities.Run("make", null, null, Path.Combine(projectGenDir, "compiler", "linux-" + configuration), Utilities.RunOptions.ConsoleLogOutput); + Utilities.Run("make", null, null, Path.Combine(projectGenDir, "compiler", "linux-" + configuration), Utilities.RunOptions.ConsoleLogOutput, envVars); break; case TargetPlatform.Mac: - Utilities.Run("xcodebuild", "-project PhysXSDK.xcodeproj -alltargets -configuration " + configuration, null, Path.Combine(projectGenDir, "compiler", preset), Utilities.RunOptions.ConsoleLogOutput); + Utilities.Run("xcodebuild", "-project PhysXSDK.xcodeproj -alltargets -configuration " + configuration, null, Path.Combine(projectGenDir, "compiler", preset), Utilities.RunOptions.ConsoleLogOutput, envVars); break; default: throw new InvalidPlatformException(BuildPlatform); } diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs b/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs index a474b9566..447f573a7 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs @@ -107,13 +107,14 @@ namespace Flax.Deps.Dependencies { { "CC", "clang-" + Configuration.LinuxClangMinVer }, { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }, + { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel }, }; var buildDir = Path.Combine(root, "build"); SetupDirectory(buildDir, true); - Utilities.Run("chmod", "+x configure", null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run(Path.Combine(root, "configure"), string.Join(" ", settings) + " --prefix=\"" + buildDir + "\"", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); - Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run("make", "install", null, root, Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("chmod", "+x configure", null, root, Utilities.RunOptions.DefaultTool); + Utilities.Run(Path.Combine(root, "configure"), string.Join(" ", settings) + " --prefix=\"" + buildDir + "\"", null, root, Utilities.RunOptions.DefaultTool, envVars); + Utilities.Run("make", null, null, root, Utilities.RunOptions.DefaultTool); + Utilities.Run("make", "install", null, root, Utilities.RunOptions.DefaultTool); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); var filename = "libcurl.a"; Utilities.FileCopy(Path.Combine(buildDir, "lib", filename), Path.Combine(depsFolder, filename)); @@ -153,11 +154,11 @@ namespace Flax.Deps.Dependencies }; var buildDir = Path.Combine(root, "build"); SetupDirectory(buildDir, true); - Utilities.Run("chmod", "+x configure", null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run("chmod", "+x install-sh", null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run(Path.Combine(root, "configure"), string.Join(" ", settings) + " --host=" + archName + " --prefix=\"" + buildDir + "\"", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); - Utilities.Run("make", null, null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run("make", "install", null, root, Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("chmod", "+x configure", null, root, Utilities.RunOptions.DefaultTool); + Utilities.Run("chmod", "+x install-sh", null, root, Utilities.RunOptions.DefaultTool); + Utilities.Run(Path.Combine(root, "configure"), string.Join(" ", settings) + " --host=" + archName + " --prefix=\"" + buildDir + "\"", null, root, Utilities.RunOptions.DefaultTool, envVars); + Utilities.Run("make", null, null, root, Utilities.RunOptions.DefaultTool); + Utilities.Run("make", "install", null, root, Utilities.RunOptions.DefaultTool); var depsFolder = GetThirdPartyFolder(options, platform, architecture); var filename = "libcurl.a"; Utilities.FileCopy(Path.Combine(buildDir, "lib", filename), Path.Combine(depsFolder, filename)); diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs b/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs index ac0079401..89ed09a72 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs @@ -114,19 +114,22 @@ namespace Flax.Deps.Dependencies } case TargetPlatform.Linux: { - var envVars = new Dictionary + var envVars = new Dictionary { { "CC", "clang-" + Configuration.LinuxClangMinVer }, - { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer } + { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }, + { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel }, }; // Fix scripts - Utilities.Run("sed", "-i -e \'s/\r$//\' autogen.sh", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); - Utilities.Run("sed", "-i -e \'s/\r$//\' configure", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run("dos2unix", "autogen.sh", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run("dos2unix", "configure", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); + //Utilities.Run("sed", "-i -e \'s/\r$//\' autogen.sh", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); + //Utilities.Run("sed", "-i -e \'s/\r$//\' configure", null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); Utilities.Run("chmod", "+x autogen.sh", null, root, Utilities.RunOptions.ThrowExceptionOnError); Utilities.Run("chmod", "+x configure", null, root, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run(Path.Combine(root, "autogen.sh"), null, null, root, Utilities.RunOptions.Default, envVars); + Utilities.Run(Path.Combine(root, "autogen.sh"), null, null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); // Disable using libpng even if it's found on the system var cmakeFile = Path.Combine(root, "CMakeLists.txt"); @@ -140,8 +143,8 @@ namespace Flax.Deps.Dependencies // Build for Linux SetupDirectory(buildDir, true); var toolchain = UnixToolchain.GetToolchainName(platform, TargetArchitecture.x64); - Utilities.Run("cmake", string.Format("-G \"Unix Makefiles\" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFT_WITH_BZIP2=OFF -DFT_WITH_ZLIB=OFF -DFT_WITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_TARGET={0} ..", toolchain), null, buildDir, Utilities.RunOptions.ThrowExceptionOnError, envVars); - Utilities.Run("cmake", "--build .", null, buildDir, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run("cmake", string.Format("-G \"Unix Makefiles\" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFT_WITH_BZIP2=OFF -DFT_WITH_ZLIB=OFF -DFT_WITH_PNG=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_TARGET={0} ..", toolchain), null, buildDir, Utilities.RunOptions.DefaultTool, envVars); + Utilities.Run("cmake", "--build .", null, buildDir, Utilities.RunOptions.DefaultTool, envVars); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); Utilities.FileCopy(Path.Combine(buildDir, libraryFileName), Path.Combine(depsFolder, libraryFileName)); diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs index 11ab39f8d..1991aa605 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs @@ -303,9 +303,9 @@ namespace Flax.Deps.Dependencies } // Ensure to have dependencies installed - Utilities.Run("ninja", "--version", null, null, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run("cmake", "--version", null, null, Utilities.RunOptions.ThrowExceptionOnError); - Utilities.Run("python", "--version", null, null, Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("ninja", "--version", null, null, Utilities.RunOptions.DefaultTool); + Utilities.Run("cmake", "--version", null, null, Utilities.RunOptions.DefaultTool); + Utilities.Run("python", "--version", null, null, Utilities.RunOptions.DefaultTool); // Get the source if (!Directory.Exists(Path.Combine(root, ".git"))) diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs b/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs index 45adc9188..d22f8696f 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs @@ -366,15 +366,17 @@ namespace Flax.Deps.Dependencies var envVars = new Dictionary { { "CC", "clang-" + Configuration.LinuxClangMinVer }, - { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer } + { "CC_FOR_BUILD", "clang-" + Configuration.LinuxClangMinVer }, + { "CXX", "clang++-" + Configuration.LinuxClangMinVer }, + { "CMAKE_BUILD_PARALLEL_LEVEL", CmakeBuildParallel }, }; var buildDir = Path.Combine(root, "build"); - Utilities.Run(Path.Combine(root, "autogen.sh"), null, null, root, Utilities.RunOptions.Default, envVars); + Utilities.Run(Path.Combine(root, "autogen.sh"), null, null, root, Utilities.RunOptions.DefaultTool, envVars); // Build for Linux var toolchain = UnixToolchain.GetToolchainName(platform, TargetArchitecture.x64); - Utilities.Run(Path.Combine(root, "configure"), string.Format("--host={0}", toolchain), null, root, Utilities.RunOptions.Default, envVars); + Utilities.Run(Path.Combine(root, "configure"), string.Format("--host={0}", toolchain), null, root, Utilities.RunOptions.ThrowExceptionOnError, envVars); SetupDirectory(buildDir, true); Utilities.Run("cmake", "-G \"Unix Makefiles\" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release ..", null, buildDir, Utilities.RunOptions.ConsoleLogOutput, envVars); Utilities.Run("cmake", "--build .", null, buildDir, Utilities.RunOptions.ConsoleLogOutput, envVars); diff --git a/Source/Tools/Flax.Build/Deps/Dependency.cs b/Source/Tools/Flax.Build/Deps/Dependency.cs index a79a968a3..43cdcc146 100644 --- a/Source/Tools/Flax.Build/Deps/Dependency.cs +++ b/Source/Tools/Flax.Build/Deps/Dependency.cs @@ -456,7 +456,7 @@ namespace Flax.Deps case TargetPlatform.Mac: break; default: throw new InvalidPlatformException(BuildPlatform); } - Utilities.Run(path, args, null, workspace, Utilities.RunOptions.ThrowExceptionOnError, envVars); + Utilities.Run(path, args, null, workspace, Utilities.RunOptions.DefaultTool, envVars); } internal bool GetMsBuildForPlatform(TargetPlatform targetPlatform, out VisualStudioVersion vsVersion, out string msBuildPath)