AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 02:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac build fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-05-27 00:59:37 -10:00
parent b03bd8dabc
commit 5a8b62b1cd
10 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/NCoreTests.cpp
View File

@@ -114,8 +114,8 @@ bool ValidateCooker(EResourceType ResourceType, bool DumpInvalidFileContents)
// Start our comparison by making sure the sizes match up
const uint kAlignment = (It->Game() >= EGame::Corruption ? 64 : 32);
const uint kAlignedOriginalSize = ALIGN( (uint) OriginalData.size(), kAlignment );
const uint kAlignedNewSize = ALIGN( (uint) NewData.size(), kAlignment );
const uint kAlignedOriginalSize = VAL_ALIGN( (uint) OriginalData.size(), kAlignment );
const uint kAlignedNewSize = VAL_ALIGN( (uint) NewData.size(), kAlignment );
const char* pkInvalidReason = "";
bool IsValid = false;

2
src/Core/Resource/Script/Property/CArrayProperty.h
View File

@@ -195,7 +195,7 @@ public:
uint32 ItemSize() const
{
uint32 ItemAlign = mpItemArchetype->DataAlignment();
uint32 ItemSize = ALIGN(mpItemArchetype->DataSize(), ItemAlign);
uint32 ItemSize = VAL_ALIGN(mpItemArchetype->DataSize(), ItemAlign);
return ItemSize;
}

2
src/Core/Resource/Script/Property/IProperty.cpp
View File

@@ -213,7 +213,7 @@ void IProperty::Initialize(IProperty* pInParent, CScriptTemplate* pInTemplate, u
{
ChildOffset += mChildren[ChildIdx-1]->DataSize();
}
ChildOffset = ALIGN(ChildOffset, pChild->DataAlignment());
ChildOffset = VAL_ALIGN(ChildOffset, pChild->DataAlignment());
// Don't call Initialize on intrinsic children as they have already been initialized.
if (!pChild->IsIntrinsic())

2
src/Core/Scene/CSceneNode.cpp
View File

@@ -144,7 +144,7 @@ void CSceneNode::BuildLightList(CGameArea *pArea)
SLightEntry(CLight *_pLight, float _Distance)
: pLight(_pLight), Distance(_Distance) {}
bool operator<(const SLightEntry& rkOther) {
bool operator<(const SLightEntry& rkOther) const {
return (Distance < rkOther.Distance);
}
};