diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp index 551002e0b..fefe48b97 100644 --- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp +++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp @@ -160,6 +160,9 @@ bool DeployDataStep::Perform(CookingData& data) } else { +#if 1 + failed |= EditorUtilities::CopyDirectoryIfNewer(dstDotnet / TEXT("host/fxr") / version, srcDotnet / TEXT("host/fxr") / version, true); +#else // TODO: hostfxr for target platform should be copied from nuget package location: microsoft.netcore.app.runtime.//runtimes//native/hostfxr.dll String dstHostfxr = dstDotnet / TEXT("host/fxr") / version; if (!FileSystem::DirectoryExists(dstHostfxr)) @@ -174,6 +177,7 @@ bool DeployDataStep::Perform(CookingData& data) failed |= FileSystem::CopyFile(dstHostfxr / TEXT("hostfxr.dylib"), depsRoot / TEXT("ThirdParty") / archName / TEXT("hostfxr.dylib")); else failed |= true; +#endif failed |= EditorUtilities::CopyDirectoryIfNewer(dstDotnet / TEXT("shared/Microsoft.NETCore.App") / version, srcDotnet / TEXT("shared/Microsoft.NETCore.App") / version, true); } if (failed) diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libfreetype.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libfreetype.a index 523e33f6b..a4a71e18e 100644 --- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libfreetype.a +++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libfreetype.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8492361a717bebf5103846b6cc0e4aaf4f1f701c7571d6faa02d4322f97fe7b3 -size 8414046 +oid sha256:0e136a228056fd02a9074bd5bbdd09cf98c53977713cb3531971b4ea412d87a2 +size 7548846 diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libopenal.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libopenal.a index dcf8e8790..5c5eebbb9 100644 --- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libopenal.a +++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libopenal.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78414594b65e5a99c7b691ffc11995491513cf6c65baaf038191de3c1ec0efc5 -size 5546306 +oid sha256:7179291d2efd8d3c8c8cd494a2c65e5b506e52929b962223f0af9faf2ba09382 +size 20142390 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.lib index fc3085c6d..cfac926fc 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e56897bc6206db416ee867f8ee530ac0945bb023b2553d3ff53c6e29b2e59971 -size 2125520 +oid sha256:dd60a9aa3ffb9fb7f80594f2e44f4cc82f72c4b31bf48ce6c228536c5d2e8221 +size 2463574 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.pdb index 17acb8c41..21ba0d376 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXMesh.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2061568c9fd443cc83e8125a2a2134bc3a5c75a4c306de8a447e599154fa6ffc -size 2453504 +oid sha256:607ccf48338273271bce83c8560c1d4f0e4c5a133a29c9bb4b679ad367017363 +size 3010560 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.lib index 069e6e78c..eed0c3ef5 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ece9e97efd754246256676994eed54f54e920a25584d00fb9a3fa37c1f263e7 -size 3256698 +oid sha256:7aca62bb2e5c0fd736b99178939e6097f2572ba77b3b4494036e7df7eb2f6cd5 +size 3420224 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.pdb index 6e277d305..ed317b55e 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/DirectXTex.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ba34f8e37d2fab479cacb62b0b7969de89a19e777919e754a78868402907b34 -size 2142208 +oid sha256:d133185ff22be11206a8c87f21b8a1c249def8c820154b550709aa6abbf430b3 +size 2920448 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/GenericCodeGen.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/GenericCodeGen.lib index 9efb68a21..f5a6f683e 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/GenericCodeGen.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/GenericCodeGen.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e71d3e62e5e212ca116559f6a16b290e056f2efe2aa4839061d37f2c5b2073f3 -size 53068 +oid sha256:578911b0b288ca4bdb0a387f7a3e5847d58d6e408841cad29b60658ddf721ffb +size 57944 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/HLSL.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/HLSL.lib index 5b530e98c..e5ca8d968 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/HLSL.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/HLSL.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deb861040077875fa04d346debe3846b076c12c9b7269bdff684bdff5e465ab5 -size 710 +oid sha256:fa8fbafa1c7884457fee0e70f293d359606fa52419360919cd7d3ace46f34399 +size 844 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/MachineIndependent.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/MachineIndependent.lib index aa2780779..b1cdfdcfe 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/MachineIndependent.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/MachineIndependent.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e95332894a2625a2426375632f53ad97981d66d3e780bd4d48c53c1a2b6e728f -size 15422382 +oid sha256:77721d52cfa53dd120dc977f24bbed3f2af122f9b6493eb969bca624430f7731 +size 10053834 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.lib index d5ddd1770..4369c70f9 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e92cff7b740448dcb882892a8ff1e7c360cccad07c8333af9c7232e9266482ba -size 2425458 +oid sha256:81baf778c669c5bbb6c7a861e94addca0c7430be38001edc6a489852d244fc74 +size 2624120 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.pdb index e3ec6d317..c7332dd43 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/NvCloth_x64.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f322c45592d9b58fe8ec9d75c2c9fbb523e752be768fcbc9f867ab9eb12f527f -size 520192 +oid sha256:70b17ba95d592f97843ac5b63f8be08025ef684c4ae10f9f4c1564d165a170ee +size 512000 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OGLCompiler.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OGLCompiler.lib index b47d7a75d..2879e6e42 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OGLCompiler.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OGLCompiler.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dcd1ddbdae26bef5dd7c5427276848ad8491ca490acc824c0d3ca3281b93a8f -size 14066 +oid sha256:a8992e2ce158003fb41d9eab42636deec54e403cccc2ab17ae70109b5b4c976c +size 14444 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OSDependent.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OSDependent.lib index 763792a5e..f9c7c3af6 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OSDependent.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OSDependent.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da8541f83f563835308f1b6f68d0ae514d55bb9c5ddad9af573387e6829274fa -size 6644 +oid sha256:b041bafda9771de692cefc42220e69ca4ec06ac315cdb85f0d92296b5514d71e +size 6560 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.dll index bfcf466aa..7ef160291 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e2d830d2a3aa85bf17033aa50745e7c1a8bb11ae350fe14fedd2a1292a6e0e8 -size 2212352 +oid sha256:d4bc89abf5a72c9c3dede29d1cbe5ced923d99e99ba82b76c7b25e940e6f4f25 +size 1111552 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.lib index cfdf86a25..3f70d273b 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:868b0298d15dfd4864c12400ffd1b8e530166ab3194e11c4532e1383c7c7c816 -size 98040 +oid sha256:e7636bd763b099f84d2015fa89635d27d4298b2c8c38ce0335b545ae9e2b4db4 +size 37562 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools-opt.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools-opt.lib index b8a697dfe..a86c4aaaf 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools-opt.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools-opt.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3f6cc77f160e73a2d6052b021d632e0d7ba90e3f2d3fb0b6d7d199bbab45baa -size 68688710 +oid sha256:76cee84936f7acb7499b8ceed8dee11bc6710aea5e4715ff8165c104985bb621 +size 34007514 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools.lib index ede2192e2..f3bf0faa7 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV-Tools.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de981934f631e878883f7370e83ba6fd62bce897fe2954b975a5752355d75af7 -size 16890152 +oid sha256:296d39dea72b89b718dc2a04eb8ab2341542f1e8a52bc8c0359107d0f6209e98 +size 10363024 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV.lib index 8ad3c9f0b..f7c6309af 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SPIRV.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f8b42075ad11e2a1cb66669651f1bdf3ba5ad8ef2ba20e286c286ef6352d09b -size 4767820 +oid sha256:d3eab7b189fdb4335525a578585504e68661e1287b4222d4c12de441878621b9 +size 2933362 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.lib index f778d533b..4a1d233f2 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e41b5c122652ffb6d27323fb8415c18140d010056f2993a8b5f854bbb45940d -size 6030408 +oid sha256:e5e142c625149d81d229dc3e740bdaa509aded329c1e4541a17fd761c2c6f2e0 +size 6200304 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.pdb index 6be334bbc..d06db83f4 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/UVAtlas.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a9287a7dcd3a43e50f03672d9748dbad4eac4e3c06ff6bde37e29b3fec00776 -size 2183168 +oid sha256:0a1c7296511baeec0b9842d7c427461e8f183bcef1f8038029184117f053a2ae +size 2248704 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.dll index 22b96ca9b..0fa3e1ad4 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b7a3131c44b92dcfd4e5b5ce9dbdda056730fcfff2221d1db1f12594d6f5536 +oid sha256:8cdddc7c402d11e4336f5a8ee8c7a958076d86f20232246f574d1d37ff1e04de size 2191872 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.lib index 42822d2bd..82446c4d2 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/assimp-vc140-md.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:839ac268010c3b41b24a2511c36372cb4249d7171a5119e2f54b84a49ad56ba5 +oid sha256:664cfbb4c622b15fd8de13fc359eb16bb6fe92d473ab8bcd384444103684f15c size 364390 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/astcenc.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/astcenc.lib index d89395539..435dc8244 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/astcenc.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/astcenc.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38500ac222bd4132dd81ea03016462add2b0c8188b7cb7101223d19bf209cd01 -size 536548 +oid sha256:69f7a54d9331e184153cfce171d29e046e43590cb9374f5e1f370e977f61e551 +size 538106 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.dll index 56e413237..0b80ba584 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1b50f7075e2ee47c8d184e38862a83b880a90fd2ff00da7bb1eb61e24e00f5d -size 4467904 +oid sha256:352c4ce7151fe9bc37dd9ceddb958a5ee75851c57df961f6381ec552affba198 +size 4916856 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.lib new file mode 100644 index 000000000..95e6bc166 --- /dev/null +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/d3dcompiler_47.lib @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be5917a82c8dc43cad798f7a6c11b1dd885eec8ee9675057804ec367f322e7ad +size 8314 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll index 9947f63a9..4e56df12a 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0849eef97571a3170e20e3eb697f3467d92f98f627386ed9dbfed23a146528b -size 20067744 +oid sha256:7f504ba5f5173c50ba4ce2771c3d32618f886e1c990960ba706f58872224541b +size 14722664 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib index 4a2878f4d..c77fc6661 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a7281c5a0091eb1a7f6e543cd4eb57547c0a17c53ce2d5cc82ed17ac195a3e0 -size 2002 +oid sha256:17dfb5b37d5aec03943083c04899b0815556d7f10f020fa8f9f9061c971dc010 +size 2086 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll index 01d720b18..ec6f74a5b 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:caaeba17de17643fc081f805942702bd62b5859dcbdca0358ace499085606e12 -size 1526184 +oid sha256:6c37738cd2fb4d659b0f49dead8311ae75c93b8c6602b991c00e070f7be20bc1 +size 1508472 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.lib index 08535f7a6..84f5f6e99 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a24a1323cef66bdb59239e9d1c73b8e502440be5faf29688b817921c1f265600 -size 3944178 +oid sha256:fdc41f7323658fcd3077c951b500749623ba6ee492576c67e6ab836da7f7a6ec +size 4603860 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.pdb index 3ed62607c..8093eb6a4 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.pdb +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/freetype.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f9cf7608a0ec97fa19018c7e0874c292a68b82bde4a22745b8c9139a6699b22 -size 471040 +oid sha256:ca629434ded3ee2b7de460f6e084f37cb5840b5b086507160ed2fbeb35e71a97 +size 528384 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/glslang.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/glslang.lib index f25c07bbc..102542d3f 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/glslang.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/glslang.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e99cb9070bfebd7485e318e272ff250d38dbcb654340e28885c8dafc55c464d -size 164520 +oid sha256:2fce38e2990b7b8e69cd769b920f7ab34e91a3ab8e447c47e53a3d69e5533d32 +size 166612 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libcurl.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libcurl.lib index 76455890e..eebbaecdb 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libcurl.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libcurl.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:237b485c9ff8bf6b2958d8d8e228d07af6949f6675675be61f45aae28a39e1d5 -size 3766516 +oid sha256:807440d52892d2eaed6179330899572ac57f54f0b68dfa6449191a682f16f025 +size 1748384 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libogg_static.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libogg_static.lib index 139c0d9ce..77b0ff1f9 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libogg_static.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libogg_static.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d20bd882a7f2ea32089bebaac06f7969caa6d050fcd4079807811bf18e6a07e -size 42214 +oid sha256:67a7d3c72c5235416601496666ac0c1143fb94169346bb8f236ce027fa753b81 +size 50420 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbis_static.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbis_static.lib index 448ad4be7..3b968861f 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbis_static.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbis_static.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ccc266baecbcf38dca35df4c8e71eacb0cfb1fd2fefdfc5e73ae172981c1b80 -size 996624 +oid sha256:a31f2c6cbc7bbd032cde6aab897fc6e89ae7925c719fff390ea051954d3d70c4 +size 1063506 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbisfile_static.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbisfile_static.lib index 28c18a099..44fbdc45c 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbisfile_static.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/libvorbisfile_static.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:945bf05bc9c01747763505c740b3cce3d52e31319d9f27c1d89d527764b59b38 -size 68374 +oid sha256:3c15a39c5985202ed9acc9a020788502113cf84c6e2b2dde09defae2d40abc0e +size 64650 diff --git a/Source/ThirdParty/freetype/config/ftoption.h b/Source/ThirdParty/freetype/config/ftoption.h index 1976b33af..2c74a1680 100644 --- a/Source/ThirdParty/freetype/config/ftoption.h +++ b/Source/ThirdParty/freetype/config/ftoption.h @@ -109,7 +109,7 @@ FT_BEGIN_HEADER * ``` * */ -#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES + /************************************************************************** diff --git a/Source/ThirdParty/freetype/config/ftstdlib.h b/Source/ThirdParty/freetype/config/ftstdlib.h index f65148a90..a3aac36d8 100644 --- a/Source/ThirdParty/freetype/config/ftstdlib.h +++ b/Source/ThirdParty/freetype/config/ftstdlib.h @@ -153,7 +153,7 @@ #define ft_strtol strtol -#define ft_getenv getenv +char* ft_getenv(const char* n); /************************************************************************** diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs index 678d50c62..3cc1bacf0 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/Assimp.cs @@ -91,6 +91,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXMesh.cs b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXMesh.cs index f7c19c437..c47881efe 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXMesh.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXMesh.cs @@ -46,6 +46,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXShaderCompiler.cs b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXShaderCompiler.cs index df7d49a81..028496ef6 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXShaderCompiler.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXShaderCompiler.cs @@ -36,6 +36,7 @@ namespace Flax.Deps.Dependencies { foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXTex.cs b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXTex.cs index 384cb25e8..c407cfbe8 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/DirectXTex.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/DirectXTex.cs @@ -22,7 +22,6 @@ namespace Flax.Deps.Dependencies return new[] { TargetPlatform.Windows, - TargetPlatform.UWP, TargetPlatform.XboxOne, TargetPlatform.XboxScarlett, }; @@ -48,6 +47,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/NewtonsoftJson.cs b/Source/Tools/Flax.Build/Deps/Dependencies/NewtonsoftJson.cs index 048fa9ea1..36d33e755 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/NewtonsoftJson.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/NewtonsoftJson.cs @@ -22,7 +22,6 @@ namespace Flax.Deps.Dependencies return new[] { TargetPlatform.Windows, - TargetPlatform.UWP, TargetPlatform.Linux, TargetPlatform.XboxOne, TargetPlatform.XboxScarlett, @@ -60,6 +59,7 @@ namespace Flax.Deps.Dependencies Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, buildPlatform); foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: @@ -84,6 +84,7 @@ namespace Flax.Deps.Dependencies Deploy.VCEnvironment.BuildSolution(solutionPath, configuration, buildPlatform); foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.UWP: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs b/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs index 80852fb61..7be41423f 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs @@ -61,6 +61,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs b/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs index eeb87586e..b6b5fa83d 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs @@ -54,6 +54,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs index f59fac426..9abd4121c 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs @@ -384,6 +384,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/UVAtlas.cs b/Source/Tools/Flax.Build/Deps/Dependencies/UVAtlas.cs index 1f8f046f0..9a32b979c 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/UVAtlas.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/UVAtlas.cs @@ -47,6 +47,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/astc.cs b/Source/Tools/Flax.Build/Deps/Dependencies/astc.cs index dcf24c3f3..c7e5b443b 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/astc.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/astc.cs @@ -45,6 +45,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs b/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs index 8492cbae7..37d1351a4 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/curl.cs @@ -69,6 +69,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/dbghelp.cs b/Source/Tools/Flax.Build/Deps/Dependencies/dbghelp.cs index 318c31239..35f8545ee 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/dbghelp.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/dbghelp.cs @@ -35,6 +35,7 @@ namespace Flax.Deps.Dependencies { foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs b/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs index 4d0d0857e..03918ae97 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/freetype.cs @@ -26,7 +26,6 @@ namespace Flax.Deps.Dependencies return new[] { TargetPlatform.Windows, - TargetPlatform.UWP, TargetPlatform.XboxOne, TargetPlatform.PS4, TargetPlatform.PS5, @@ -50,14 +49,6 @@ namespace Flax.Deps.Dependencies } } - private void PatchWindowsTargetPlatformVersion(string vcxprojPath, string vcxprojContents, string windowsTargetPlatformVersion, string platformToolset) - { - // Fix the MSVC project settings for Windows - var contents = vcxprojContents.Replace("$(DefaultPlatformToolset)", string.Format("{0}", platformToolset)); - contents = contents.Replace("", string.Format("{0}", windowsTargetPlatformVersion)); - File.WriteAllText(vcxprojPath, contents); - } - /// public override void Build(BuildOptions options) { @@ -92,9 +83,18 @@ namespace Flax.Deps.Dependencies var libraryFileName = "libfreetype.a"; vcxprojContents = vcxprojContents.Replace("MultiThreaded", "MultiThreadedDLL"); vcxprojContents = vcxprojContents.Replace("MultiThreadedDebug", "MultiThreadedDebugDLL"); + vcxprojContents = vcxprojContents.Replace("<v142", "v143"); + Utilities.ReplaceInFile(Path.Combine(root, "include", "freetype", "config", "ftoption.h"), "#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES", ""); + var msvcProps = new Dictionary + { + { "WindowsTargetPlatformVersion", "10.0" }, + { "PlatformToolset", "v143" }, + //{ "RuntimeLibrary", "MultiThreadedDLL" } + }; foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: @@ -105,31 +105,13 @@ namespace Flax.Deps.Dependencies // Build for Windows foreach (var architecture in new[] { TargetArchitecture.x64, TargetArchitecture.ARM64 }) { - Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, architecture.ToString(), - new Dictionary() { - { "WindowsTargetPlatformVersion", "10.0" }, - { "PlatformToolset", "v143" }, - //{ "RuntimeLibrary", "MultiThreadedDLL" } - }); + Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, architecture.ToString(), msvcProps); var depsFolder = GetThirdPartyFolder(options, platform, architecture); foreach (var filename in binariesToCopyMsvc) Utilities.FileCopy(Path.Combine(root, "objs", architecture.ToString(), configurationMsvc, filename), Path.Combine(depsFolder, filename)); } break; } - case TargetPlatform.UWP: - { - // Fix the MSVC project settings for UWP - PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.17763.0", "v141"); - - // Build for UWP x64 - Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64"); - var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); - foreach (var filename in binariesToCopyMsvc) - Utilities.FileCopy(Path.Combine(root, "objs", "x64", configurationMsvc, filename), Path.Combine(depsFolder, filename)); - - break; - } case TargetPlatform.Linux: { var envVars = new Dictionary @@ -198,11 +180,8 @@ namespace Flax.Deps.Dependencies } case TargetPlatform.XboxOne: { - // Fix the MSVC project settings for Xbox One - PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.19041.0", "v142"); - // Build for Xbox One x64 - Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64"); + Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64", msvcProps); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); foreach (var filename in binariesToCopyMsvc) Utilities.FileCopy(Path.Combine(root, "objs", "x64", configurationMsvc, filename), Path.Combine(depsFolder, filename)); @@ -211,11 +190,8 @@ namespace Flax.Deps.Dependencies } case TargetPlatform.XboxScarlett: { - // Fix the MSVC project settings for Xbox Scarlett - PatchWindowsTargetPlatformVersion(vcxprojPath, vcxprojContents, "10.0.19041.0", "v142"); - // Build for Xbox Scarlett - Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64"); + Deploy.VCEnvironment.BuildSolution(vsSolutionPath, configurationMsvc, "x64", msvcProps); var depsFolder = GetThirdPartyFolder(options, platform, TargetArchitecture.x64); foreach (var filename in binariesToCopyMsvc) Utilities.FileCopy(Path.Combine(root, "objs", "x64", configurationMsvc, filename), Path.Combine(depsFolder, filename)); diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs b/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs index 813e0f016..bcf217169 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/glslang.cs @@ -56,6 +56,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs index 090edf4be..b6df212bc 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs @@ -324,6 +324,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); var platformData = Path.Combine(GetBinariesFolder(options, platform), "Data", "nethost"); if (Directory.Exists(platformData)) Utilities.DirectoryCopy(platformData, root, true, true); diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs b/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs index dbf5d6bc6..1fcd5bba5 100644 --- a/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs +++ b/Source/Tools/Flax.Build/Deps/Dependencies/vorbis.cs @@ -26,7 +26,6 @@ namespace Flax.Deps.Dependencies return new[] { TargetPlatform.Windows, - TargetPlatform.UWP, TargetPlatform.XboxOne, TargetPlatform.PS4, TargetPlatform.PS5, @@ -74,15 +73,18 @@ namespace Flax.Deps.Dependencies new Binary("libvorbis_static.lib", "libvorbis"), new Binary("libvorbisfile_static.lib", "libvorbisfile"), }; + private (string, string)[] vorbisBinariesToCopyWindowsCmake = { ("vorbis.lib", "libvorbis_static.lib"), ("vorbisfile.lib", "libvorbisfile_static.lib"), }; + private Binary[] oggBinariesToCopyWindows = { new Binary("libogg_static.lib", "ogg"), }; + private (string, string)[] oggBinariesToCopyWindowsCmake = { ("ogg.lib", "libogg_static.lib"), @@ -198,27 +200,6 @@ namespace Flax.Deps.Dependencies binariesToCopy.AddRange(vorbisBinariesToCopyWindows.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); break; } - case TargetPlatform.UWP: - { - buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010"); - vcxprojPaths = vcxprojPathsWindows; - PatchWindowsTargetPlatformVersion("10.0.17763.0", "v141"); - switch (architecture) - { - case TargetArchitecture.x86: - buildPlatform = "Win32"; - break; - case TargetArchitecture.x64: - buildPlatform = "x64"; - break; - case TargetArchitecture.ARM: - buildPlatform = "ARM"; - break; - default: throw new InvalidArchitectureException(architecture); - } - binariesToCopy.AddRange(vorbisBinariesToCopyWindows.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); - break; - } case TargetPlatform.PS4: { buildDir = Path.Combine(rootMsvcLib, "PS4"); @@ -234,7 +215,7 @@ namespace Flax.Deps.Dependencies Utilities.DirectoryCopy(Path.Combine(GetBinariesFolder(options, platform), "Data", "vorbis"), buildDir, true, true); Utilities.FileCopy(Path.Combine(GetBinariesFolder(options, platform), "Data", "ogg", "ogg", "config_types.h"), - Path.Combine(root, "..", "ogg", "include", "ogg", "config_types.h")); + Path.Combine(root, "libogg", "include", "ogg", "config_types.h")); binariesToCopy.AddRange(binariesToCopyVorbis.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); break; } @@ -255,7 +236,7 @@ namespace Flax.Deps.Dependencies buildDir, true, true); Utilities.FileCopy( Path.Combine(GetBinariesFolder(options, platform), "Data", "ogg", "ogg", "config_types.h"), - Path.Combine(root, "..", "ogg", "include", "ogg", "config_types.h")); + Path.Combine(root, "libogg", "include", "ogg", "config_types.h")); binariesToCopy.AddRange(binariesToCopyVorbis.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); break; } @@ -263,14 +244,14 @@ namespace Flax.Deps.Dependencies buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010"); vcxprojPaths = vcxprojPathsWindows; buildPlatform = "x64"; - PatchWindowsTargetPlatformVersion("10.0.19041.0", "v142"); + PatchWindowsTargetPlatformVersion("10.0", "v143"); binariesToCopy.AddRange(vorbisBinariesToCopyWindows.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); break; case TargetPlatform.XboxScarlett: buildDir = Path.Combine(rootMsvcLib, "win32", "VS2010"); vcxprojPaths = vcxprojPathsWindows; buildPlatform = "x64"; - PatchWindowsTargetPlatformVersion("10.0.19041.0", "v142"); + PatchWindowsTargetPlatformVersion("10.0", "v143"); binariesToCopy.AddRange(vorbisBinariesToCopyWindows.Select(x => new Binary(x.Filename, Path.Combine(buildDir, x.SrcFolder, buildPlatform, configurationMsvc)))); break; default: throw new InvalidPlatformException(platform); @@ -307,11 +288,11 @@ namespace Flax.Deps.Dependencies case TargetPlatform.Linux: ext = ".a"; break; - default: - throw new InvalidPlatformException(platform); + default: throw new InvalidPlatformException(platform); } - List<(string, string)> binariesToCopy = new List<(string, string)>(); + var binariesToCopy = new List<(string, string)>(); + // Build ogg { var solutionPath = Path.Combine(oggBuildDir, "ogg.sln"); @@ -356,6 +337,7 @@ namespace Flax.Deps.Dependencies foreach (var platform in options.Platforms) { + BuildStarted(platform); switch (platform) { case TargetPlatform.Windows: diff --git a/Source/Tools/Flax.Build/Deps/Dependency.cs b/Source/Tools/Flax.Build/Deps/Dependency.cs index 5f515d33c..848f2a2a9 100644 --- a/Source/Tools/Flax.Build/Deps/Dependency.cs +++ b/Source/Tools/Flax.Build/Deps/Dependency.cs @@ -62,6 +62,15 @@ namespace Flax.Deps /// The options. public abstract void Build(BuildOptions options); + /// + /// Logs build process start. + /// + /// Target platform. + protected void BuildStarted(TargetPlatform platform) + { + Log.Info($"Building {GetType().Name} for {platform}"); + } + /// /// Gets the dependency third-party packages binaries folder. ///