From 5de19404d9403fa03f34c1db8ba8db82d3a10539 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 6 Nov 2020 02:11:13 -0600 Subject: [PATCH] mac compile fixes 1) `/` not `\` for includes 2) had to clean up a few extra ## bits that work fine winside, but trip up macs (only needed when stitching, had 5 spots where that was pointless) --- Engine/source/T3D/assets/ImageAsset.h | 6 +++--- Engine/source/T3D/notesObject.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index 07962b850..8b9e9729c 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -178,7 +178,7 @@ public: void set##name##Asset(AssetPtr_in) { m##name##Asset = _in; }\ static bool _set##name##Asset(void* obj, const char* index, const char* data)\ {\ - ##className* mat = static_cast<##className*>(obj);\ + className* mat = static_cast(obj);\ mat->m##name##AssetId = StringTable->insert(data);\ if (ImageAsset::getAssetById(mat->m##name##AssetId, &mat->m##name##Asset))\ {\ @@ -199,10 +199,10 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\ AssetPtr m##name##Asset[max];\ static bool _set##name##AssetSlot(void* obj, const char* index, const char* data)\ {\ - ##className* mat = static_cast<##className*>(obj);\ + className* mat = static_cast(obj);\ if (!index) return false;\ U32 idx = dAtoi(index);\ - if (idx >= ##max)\ + if (idx >= max)\ return false;\ mat->m##name##AssetId[idx] = StringTable->insert(data);\ if (ImageAsset::getAssetById(mat->m##name##AssetId[idx], &mat->m##name##Asset[idx]))\ diff --git a/Engine/source/T3D/notesObject.cpp b/Engine/source/T3D/notesObject.cpp index 5490929de..1b6ccd436 100644 --- a/Engine/source/T3D/notesObject.cpp +++ b/Engine/source/T3D/notesObject.cpp @@ -7,7 +7,7 @@ #include "gfx/gfxDebugEvent.h" #include "gfx/gfxTransformSaver.h" #include "renderInstance/renderPassManager.h" -#include "math\mathUtils.h" +#include "math/mathUtils.h" #include "gfx/gfxDrawUtil.h" IMPLEMENT_CO_NETOBJECT_V1(NotesObject);