birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-23 11:13:56 -07:00
parent 25284fb3a7 b23a70ff42
commit 8c526eeeb6
33 changed files with 41 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
+1 -1
View File
@@ -342,7 +342,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
# Run a full scan to ENSURE that both caches (pc and osx) are COMPLETELY POPULATED
# Needed for asset bundling
# fmt:off
assert asset_processor.batch_process(fastscan=False, timeout=timeout * len(platforms), platforms=platforms_list), \
assert asset_processor.batch_process(fastscan=True, timeout=timeout * len(platforms), platforms=platforms_list), \
"AP Batch failed to process in bundler_batch_fixture"
# fmt:on
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+2 -15
View File
@@ -92,25 +92,12 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AssetProcessor
)
# Issue #3017
#ly_add_pytest(
# NAME AssetPipelineTests.AssetBundler
# PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
# EXCLUDE_TEST_RUN_TARGET_FROM_IDE
# TEST_SERIAL
# TEST_SUITE periodic
# RUNTIME_DEPENDENCIES
# AZ::AssetProcessor
# AZ::AssetBundlerBatch
#)
ly_add_pytest(
NAME AssetPipelineTests.AssetBundler_SandBox
TEST_SUITE sandbox
NAME AssetPipelineTests.AssetBundler
PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
PYTEST_MARKS "SUITE_sandbox" # run only sandbox tests in this file
EXCLUDE_TEST_RUN_TARGET_FROM_IDE
TEST_SERIAL
TEST_SUITE periodic
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
AZ::AssetBundlerBatch
AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override
+1 -1
View File
@@ -69,7 +69,7 @@
{},
{},
{},
"TouchBend"
{}
]
},
"Groups": {
Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionGroups.cpp
-12
View File
@@ -13,14 +13,6 @@
#include <AzFramework/Physics/CollisionBus.h>
//This bit is defined in the TouchBending Gem wscript.
//Make sure the bit has a valid value.
#ifdef TOUCHBENDING_LAYER_BIT
#if (TOUCHBENDING_LAYER_BIT < 1) || (TOUCHBENDING_LAYER_BIT > 63)
#error Invalid Bit Definition For the TouchBending Layer Bit
#endif
#endif //#ifdef TOUCHBENDING_LAYER_BIT
namespace AzPhysics
{
AZ_CLASS_ALLOCATOR_IMPL(CollisionGroup, AZ::SystemAllocator, 0);
@@ -31,10 +23,6 @@ namespace AzPhysics
const CollisionGroup CollisionGroup::None = 0x0000000000000000ULL;
const CollisionGroup CollisionGroup::All = 0xFFFFFFFFFFFFFFFFULL;
#ifdef TOUCHBENDING_LAYER_BIT
const CollisionGroup CollisionGroup::All_NoTouchBend = CollisionGroup::All.GetMask() & ~CollisionLayer::TouchBend.GetMask();
#endif
void CollisionGroupScriptConstructor(CollisionGroup* thisPtr, AZ::ScriptDataContext& scriptDataContext)
{
if (int numArgs = scriptDataContext.GetNumArguments();
Code/Framework/AzFramework/AzFramework/Physics/Collision/CollisionLayers.cpp
-12
View File
@@ -14,14 +14,6 @@
#include <AzFramework/Physics/CollisionBus.h>
//This bit is defined in the TouchBending Gem wscript.
//Make sure the bit has a valid value.
#ifdef TOUCHBENDING_LAYER_BIT
#if (TOUCHBENDING_LAYER_BIT < 1) || (TOUCHBENDING_LAYER_BIT > 63)
#error Invalid Bit Definition For the TouchBending Layer Bit
#endif
#endif //#ifdef TOUCHBENDING_LAYER_BIT
namespace AzPhysics
{
AZ_CLASS_ALLOCATOR_IMPL(CollisionLayer, AZ::SystemAllocator, 0);
@@ -29,10 +21,6 @@ namespace AzPhysics
const CollisionLayer CollisionLayer::Default = 0;
#ifdef TOUCHBENDING_LAYER_BIT
const CollisionLayer CollisionLayer::TouchBend = TOUCHBENDING_LAYER_BIT;
#endif
void CollisionLayer::Reflect(AZ::ReflectContext* context)
{
if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
Code/Framework/AzFramework/AzFramework/Physics/SimulatedBodies/StaticRigidBody.h
+10 -2
View File
@@ -32,12 +32,20 @@ namespace AzPhysics
{
public:
AZ_CLASS_ALLOCATOR_DECL;
AZ_RTTI(StaticRigidBody, "{13A677BB-7085-4EDB-BCC8-306548238692}", SimulatedBody);
AZ_RTTI(AzPhysics::StaticRigidBody, "{13A677BB-7085-4EDB-BCC8-306548238692}", AzPhysics::SimulatedBody);
static void Reflect(AZ::ReflectContext* context);
//Legacy API - may change with LYN-438
//! Add a shape to the static rigid body.
//! @param shape A shared pointer of the shape to add.
virtual void AddShape(const AZStd::shared_ptr<Physics::Shape>& shape) = 0;
//! Returns the number of shapes that make up this static rigid body.
//! @return Returns the number of shapes as a AZ::u32.
virtual AZ::u32 GetShapeCount() { return 0; }
//! Returns a shared pointer to the requested shape index.
//! @param index The index of the shapes to return. Expected to be between 0 and GetShapeCount().
//! @return Returns a shared pointer of the shape requested or nullptr if index is out of bounds.
virtual AZStd::shared_ptr<Physics::Shape> GetShape([[maybe_unused]]AZ::u32 index) { return nullptr; }
};
}
Code/Framework/AzFramework/CMakeLists.txt
-10
View File
@@ -10,8 +10,6 @@
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)
set(LY_TOUCHBENDING_LAYER_BIT 63 CACHE STRING "Use TouchBending as the collision layer. The TouchBending layer can be a number from 1 to 63 (Default=63).")
ly_add_target(
NAME AzFramework STATIC
NAMESPACE AZ
@@ -37,14 +35,6 @@ ly_add_target(
3rdParty::lz4
)
ly_add_source_properties(
SOURCES
AzFramework/Physics/Collision/CollisionGroups.cpp
AzFramework/Physics/Collision/CollisionLayers.cpp
PROPERTY COMPILE_DEFINITIONS
VALUES TOUCHBENDING_LAYER_BIT=${LY_TOUCHBENDING_LAYER_BIT}
)
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Tests/Platform/${PAL_PLATFORM_NAME})
Code/Legacy/CrySystem/SystemInit.cpp
+4 -1
View File
@@ -1609,6 +1609,9 @@ AZ_POP_DISABLE_WARNING
// Send out EBus event
EBUS_EVENT(CrySystemEventBus, OnCrySystemInitialized, *this, startupParams);
// Execute any deferred commands that uses the CVar commands that were just registered
AZ::Interface<AZ::IConsole>::Get()->ExecuteDeferredConsoleCommands();
// Verify that the Maestro Gem initialized the movie system correctly. This can be removed if and when Maestro is not a required Gem
if (gEnv->IsEditor() && !gEnv->pMovieSystem)
{
@@ -1624,7 +1627,7 @@ AZ_POP_DISABLE_WARNING
m_bInitializedSuccessfully = true;
return (true);
return true;
}
Gems/PhysX/Code/CMakeLists.txt
+1 -10
View File
@@ -226,13 +226,4 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
OUTPUT_SUBDIRECTORY
Test.Assets/Gems/PhysX/Code/Tests
)
endif()
ly_add_source_properties(
SOURCES
Editor/CollisionLayersWidget.cpp
Source/Collision.cpp
Source/Configuration/PhysXConfiguration.cpp
PROPERTY COMPILE_DEFINITIONS
VALUES TOUCHBENDING_LAYER_BIT=${LY_TOUCHBENDING_LAYER_BIT}
)
endif()
Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
-9
View File
@@ -22,9 +22,6 @@ namespace PhysX
namespace Editor
{
const AZStd::string CollisionLayersWidget::s_defaultCollisionLayerName = "Default";
#ifdef TOUCHBENDING_LAYER_BIT
const AZStd::string CollisionLayersWidget::s_touchBendCollisionLayerName = "TouchBend";
#endif
CollisionLayersWidget::CollisionLayersWidget(QWidget* parent)
: QWidget(parent)
@@ -150,12 +147,6 @@ namespace PhysX
{
lineEditCtrl->setEnabled(false);
}
#ifdef TOUCHBENDING_LAYER_BIT
else if (lineEditCtrl->value() == s_touchBendCollisionLayerName)
{
lineEditCtrl->setEnabled(false);
}
#endif
}
}
Gems/PhysX/Code/Editor/CollisionLayersWidget.h
-3
View File
@@ -35,9 +35,6 @@ namespace PhysX
static const AZ::u32 s_maxCollisionLayerNameLength = 32;
static const AZStd::string s_defaultCollisionLayerName;
#ifdef TOUCHBENDING_LAYER_BIT
static const AZStd::string s_touchBendCollisionLayerName;
#endif
explicit CollisionLayersWidget(QWidget* parent = nullptr);
Gems/PhysX/Code/Source/Collision.cpp
-31
View File
@@ -38,21 +38,6 @@ namespace PhysX
return physx::PxFilterFlag::eDEFAULT;
}
//Enable/Disable this macro in the TouchBending Gem wscript
#ifdef TOUCHBENDING_LAYER_BIT
//If any of the actors is in the TouchBend layer then we are not interested
//in contact data, nor interested in eNOTIFY_* callbacks.
const AZ::u64 touchBendLayerMask = AzPhysics::CollisionLayer::TouchBend.GetMask();
const AZ::u64 layer0 = Combine(filterData0.word0, filterData0.word1);
const AZ::u64 layer1 = Combine(filterData1.word0, filterData1.word1);
if (layer0 == touchBendLayerMask || layer1 == touchBendLayerMask)
{
pairFlags = physx::PxPairFlag::eSOLVE_CONTACT |
physx::PxPairFlag::eDETECT_DISCRETE_CONTACT;
return physx::PxFilterFlag::eDEFAULT;
}
#endif //TOUCHBENDING_LAYER_BIT
// generate contacts for all that were not filtered above
pairFlags =
physx::PxPairFlag::eCONTACT_DEFAULT |
@@ -89,22 +74,6 @@ namespace PhysX
return physx::PxFilterFlag::eDEFAULT;
}
//Enable/Disable this macro in the TouchBending Gem wscript
#ifdef TOUCHBENDING_LAYER_BIT
//If any of the actors is in the TouchBend layer then we are not interested
//in contact data, nor interested in eNOTIFY_* callbacks.
const AZ::u64 layer0 = Combine(filterData0.word0, filterData0.word1);
const AZ::u64 layer1 = Combine(filterData1.word0, filterData1.word1);
const AZ::u64 touchBendLayerMask = AzPhysics::CollisionLayer::TouchBend.GetMask();
if (layer0 == touchBendLayerMask || layer1 == touchBendLayerMask)
{
pairFlags = physx::PxPairFlag::eSOLVE_CONTACT |
physx::PxPairFlag::eDETECT_DISCRETE_CONTACT |
physx::PxPairFlag::eDETECT_CCD_CONTACT;
return physx::PxFilterFlag::eDEFAULT;
}
#endif
// generate contacts for all that were not filtered above
pairFlags =
physx::PxPairFlag::eCONTACT_DEFAULT |
Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
-5
View File
@@ -23,11 +23,6 @@ namespace PhysX
configuration.m_collisionGroups.CreateGroup("All", AzPhysics::CollisionGroup::All, AzPhysics::CollisionGroups::Id(), true);
configuration.m_collisionGroups.CreateGroup("None", AzPhysics::CollisionGroup::None, AzPhysics::CollisionGroups::Id::Create(), true);
#ifdef TOUCHBENDING_LAYER_BIT
configuration.m_collisionLayers.SetName(AzPhysics::CollisionLayer::TouchBend, "TouchBend");
configuration.m_collisionGroups.CreateGroup("All_NoTouchBend", AzPhysics::CollisionGroup::All_NoTouchBend, AzPhysics::CollisionGroups::Id::Create(), true);
#endif
return configuration;
}
Gems/PhysX/Code/Source/RigidBodyStatic.cpp
+3 -1
View File
@@ -20,6 +20,8 @@
namespace PhysX
{
AZ_CLASS_ALLOCATOR_IMPL(PhysX::StaticRigidBody, AZ::SystemAllocator, 0);
StaticRigidBody::StaticRigidBody(const AzPhysics::StaticRigidBodyConfiguration& configuration)
{
CreatePhysXActor(configuration);
@@ -40,7 +42,7 @@ namespace PhysX
// Invalidate user data so it sets m_pxStaticRigidBody->userData to nullptr.
// It's appropriate to do this as m_pxStaticRigidBody is a shared pointer and
// techniqucally it could survive m_actorUserData life's spam.
// technically it could survive m_actorUserData life's span.
m_actorUserData.Invalidate();
}
Gems/PhysX/Code/Source/RigidBodyStatic.h
+2 -2
View File
@@ -26,8 +26,8 @@ namespace PhysX
: public AzPhysics::StaticRigidBody
{
public:
AZ_CLASS_ALLOCATOR(StaticRigidBody, AZ::SystemAllocator, 0);
AZ_RTTI(StaticRigidBody, "{06E960EF-E1F3-466F-B34F-800E32775092}", AzPhysics::StaticRigidBody);
AZ_CLASS_ALLOCATOR_DECL;
AZ_RTTI(PhysX::StaticRigidBody, "{06E960EF-E1F3-466F-B34F-800E32775092}", AzPhysics::StaticRigidBody);
StaticRigidBody() = default;
StaticRigidBody(const AzPhysics::StaticRigidBodyConfiguration& configuration);
Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
-2
View File
@@ -24,7 +24,6 @@ namespace PhysX
{
protected:
const AZStd::string DefaultLayer = "Default";
const AZStd::string TouchBendLayer = "TouchBend";
const AZStd::string LayerA = "LayerA";
const AZStd::string LayerB = "LayerB";
const AZStd::string GroupA = "GroupA";
@@ -42,7 +41,6 @@ namespace PhysX
AZStd::vector<AZStd::string> TestCollisionLayers =
{
DefaultLayer,
TouchBendLayer, // This is needed here as placeholder as collision events are disabled on this layer.
LayerA,
LayerB
};
cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@
# shared by other platforms:
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform TARGETS RapidJSON PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023)
ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform TARGETS RapidJSON PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023)
ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform TARGETS RapidJSON PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023)
ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev11-multiplatform
ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform TARGETS squish-ccr PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform TARGETS RapidJSON PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023)
ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@
# shared by other platforms:
ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform TARGETS RapidJSON PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023)
ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)