android port
This commit is contained in:
+13
-4
@@ -48,10 +48,18 @@ DECLARE_BUILD_STAGE(rapier)
|
||||
};
|
||||
cProject.bFPIC = true;
|
||||
LinkProject_t linkProject = ccompiler->Compile(&cProject);
|
||||
linkProject.linkType = ELINK_DYNAMIC_LIBRARY;
|
||||
linkProject.objects.AppendTail({rapier_lib});
|
||||
linkProject.objects.AppendTail({GET_PROJECT_OBJECT(tier1, "tier1")});
|
||||
linkProject.libraryObjects.AppendTail(GET_PROJECT_OBJECT(tier0, "tier0"));
|
||||
|
||||
if ( GET_PROJECT_VALUE(config, "static") == "true" )
|
||||
{
|
||||
linkProject.linkType = ELINK_STATIC_LIBRARY;
|
||||
}
|
||||
else
|
||||
{
|
||||
linkProject.linkType = ELINK_DYNAMIC_LIBRARY;
|
||||
linkProject.objects.AppendTail({rapier_lib});
|
||||
linkProject.objects.AppendTail({GET_PROJECT_OBJECT(tier1, "tier1")});
|
||||
linkProject.libraryObjects.AppendTail(GET_PROJECT_OBJECT(tier0, "tier0"));
|
||||
}
|
||||
|
||||
if (linkProject.m_target.kernel & TARGET_KERNEL_WINDOWS_DEVICES)
|
||||
{
|
||||
@@ -73,6 +81,7 @@ DECLARE_BUILD_STAGE(rapier)
|
||||
CUtlString sz_libRapierPhysics = linker->Link(&linkProject);
|
||||
|
||||
ADD_OUTPUT_OBJECT("physics", sz_libRapierPhysics);
|
||||
ADD_OUTPUT_OBJECT("rapier_static", rapier_lib);
|
||||
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -94,7 +94,6 @@ public:
|
||||
virtual CastResult_t ShapeCast( HShape hShape, Quat vOrientation, Vector vBegin, Vector vEnd, fnCheckCast check ) override
|
||||
{
|
||||
return CRapierPhysicsWorld_ShapeCast(m_pWorld, (RapierShape_t*)hShape, vOrientation, vBegin, vEnd, (Option_checkCastFn){check} );
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user