merge 3.3.2 (#192)

* Fix issue (#190) https://github.com/cocos-creator/3d-tasks/issues/9185 * spirv cross for ios 10.0 (#191) Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local> Co-authored-by: timlyeee <43355299+timlyeee@users.noreply.github.com> Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>
2021-09-24 11:48:06 +08:00 · 2021-09-24 11:48:06 +08:00 · c062a38ab9
parent e3f45c9eb5
commit c062a38ab9
19 changed files with 0 additions and 0 deletions
--- a/ios/libs/spirv-cross/libspirv-cross-core.a
+++ b/ios/libs/spirv-cross/libspirv-cross-core.a
--- a/ios/libs/spirv-cross/libspirv-cross-glsl.a
+++ b/ios/libs/spirv-cross/libspirv-cross-glsl.a
--- a/ios/libs/spirv-cross/libspirv-cross-msl.a
+++ b/ios/libs/spirv-cross/libspirv-cross-msl.a
--- a/win64/libs/PhysX/debug/PhysXCharacterKinematic_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXCharacterKinematic_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXCommon_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXCommon_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXCooking_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXCooking_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXExtensions_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXExtensions_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXFoundation_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXFoundation_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXPvdSDK_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXPvdSDK_static_64.lib
--- a/win64/libs/PhysX/debug/PhysXVehicle_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysXVehicle_static_64.lib
--- a/win64/libs/PhysX/debug/PhysX_static_64.lib
+++ b/win64/libs/PhysX/debug/PhysX_static_64.lib
--- a/win64/libs/PhysX/release/PhysXCharacterKinematic_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXCharacterKinematic_static_64.lib
--- a/win64/libs/PhysX/release/PhysXCommon_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXCommon_static_64.lib
--- a/win64/libs/PhysX/release/PhysXCooking_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXCooking_static_64.lib
--- a/win64/libs/PhysX/release/PhysXExtensions_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXExtensions_static_64.lib
--- a/win64/libs/PhysX/release/PhysXFoundation_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXFoundation_static_64.lib
--- a/win64/libs/PhysX/release/PhysXPvdSDK_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXPvdSDK_static_64.lib
--- a/win64/libs/PhysX/release/PhysXVehicle_static_64.lib
+++ b/win64/libs/PhysX/release/PhysXVehicle_static_64.lib
--- a/win64/libs/PhysX/release/PhysX_static_64.lib
+++ b/win64/libs/PhysX/release/PhysX_static_64.lib